https://sakaiproject.atlassian.net/browse/SAK-15381#icft=SAK-15381 is fixed for newer doc types. The content_type* files now incorporate

https://sakaiproject.atlassian.net/browse/KNL-99#icft=KNL-99 r56159
https://sakaiproject.atlassian.net/browse/KNL-98#icft=KNL-98 r56127
https://sakaiproject.atlassian.net/browse/KNL-98#icft=KNL-98 r56111

Note that for anyone running 2-6-x and 1.0.x kernel (probably only UCT at this point) this will break Search for newer doc types (OOXML etc.) until https://sakaiproject.atlassian.net/browse/SAK-15381#icft=SAK-15381 is fixed properly (i.e. has up to date properties files) - see comments in that JIRA.

Closing based on Beths QA

I've verified email notifications, type-names, etc that had previously been present in the kernel-based properties files. All looks great – please merge to the next Kernel build.

Beth--I've committed all changes I believe are required in moving the remaining internationalization property files out of the /kernel and into /config.

TESTING

You should

1) update sakai trunk to get all the /config changes
2) checkout the kernel trunk so that you can get those changes
3) in .m2 I recommend deleting your org/sakaiproject/kernel folder and start clean
4) kernel: mvn clean install
5) start with a clean Tomcat
6) sakai: mvn clean install -Dmaven.test.skip=true sakai:deploy

Make sure that the kernel artifacts are in .m2 and in Tomcat. A quick way to confirm that the correct Kernel artifacts are in Tomcat is to check

$CATALINA_HOME/components/sakai-kernel-component/WEB-INF/lib/sakai-kernel-util-1.1-SNAPSHOT.jar

Copy the jar to a tmp folder and explode it. Then check /org/sakaiproject/util and you should find Resource.class. If not, your jar originates from the Maven repo.

I tested my changes in Spanish and initial results look good. However, I've not confirmed file uploading, dropbox, or email.

IMPLEMENTATION

I wrote a small wrapper called Resource.java that accepts the config class name and resource bundle name and returns the relevant resource loader object.

ADD /kernel/trunk/kernel-util/src/main/java/org/sakaiproject/util/Resource.java

In kernel.properties I added the following properties (which provide us now with override capabilities)

1. SAKAI RESOURCE BUNDLES

2. These language bundle property files lie outside the kernel in the Sakai config project.

3. The bundles are read in via a classLoader lookup via config util class.
   resource.class.content = org.sakaiproject.localization.util.ContentProperties
   resource.bundle.content = org.sakaiproject.localization.bundle.content.content
   resource.class.contenttype = org.sakaiproject.localization.util.ContentTypeProperties
   resource.bundle.contenttype.extensionfile = org.sakaiproject.localization.bundle.content_type.content_type_extensions
   resource.bundle.contenttype.imagefile = org.sakaiproject.localization.bundle.content_type.content_type_images
   resource.bundle.contenttype.namefile = org.sakaiproject.localization.bundle.content_type.content_type_names
   resource.class.emailimpl = org.sakaiproject.localization.util.EmailImplProperties
   resource.bundle.emailimpl = org.sakaiproject.localization.bundle.emailimpl.email-impl
   resource.class.siteimpl = org.sakaiproject.localization.util.SiteImplProperties
   resource.bundle.siteimpl = org.sakaiproject.localization.bundle.siteimpl.site-impl
   resource.class.siteemacon = org.sakaiproject.localization.util.SiteemaconProperties
   resource.bundle.siteemacon = org.sakaiproject.localization.bundle.siteemacon.siteemacon
   resource.class.tool = org.sakaiproject.localization.util.ToolProperties
   resource.bundle.tool = org.sakaiproject.localization.bundle.tool.tools
   resource.class.type = org.sakaiproject.localization.util.TypeProperties
   resource.bundle.type = org.sakaiproject.localization.bundle.type.types

I modified the following classes to 1) use the ServerConfigurationService (using injection or the cover depending, in most cases, on the current file pattern) to lookup the relevant class and bundle name before 2) calling Resource.java to return the ResourceLoader object.

In particular, please review BaseContentService.java and especially BasicContentTypeImageService.java and code changes. The latter in particular was refactored heavily.

MODIFY /kernel/trunk/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties

content

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java

content_type

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/impl/BasicContentTypeImageService.java

email-impl

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/email/impl/BaseDigestService.java

site-impl

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java

siteemacon

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/impl/SiteEmailNotificationContent.java
MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/impl/DropboxNotification.java

tools

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/tool/impl/ActiveToolComponent.java

types

MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/types/FileUploadType.java
MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/types/FolderType.java
MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/types/HtmlDocumentType.java
MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/types/TextDocumentType.java
MODIFY /kernel/trunk/kernel-impl/src/main/java/org/sakaiproject/content/types/UrlResourceType.java