Author: sshyrkov
Date: Wed Nov 14 10:46:06 2007
New Revision: 19145
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19145&repname=
=3Djahia
Log:
Added element for specifying default resource bundle
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplatesPackageHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/Templates_Xml.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/xml_dtd/t=
emplates_2_0.xsd
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/te=
mplates/JahiaTemplatesPackage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/templates/JahiaTemplatesPackage.j=
ava&rev=3D19145&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/template=
s/JahiaTemplatesPackage.java Wed Nov 14 10:46:06 2007
@@ -98,6 +98,8 @@
=
private String searchResultsPageName;
=
+ private String resourceBundleName;
+ =
/** Contains names of the template sets starting from this one, then t=
he direct parent and so on. */
private List hierarchy =3D new LinkedList();
=
@@ -576,4 +578,12 @@
public void setSearchResultsPageName(String searchResultsPageName) {
this.searchResultsPageName =3D searchResultsPageName;
}
+
+ public String getResourceBundleName() {
+ return resourceBundleName;
+ }
+
+ public void setResourceBundleName(String resourceBundleName) {
+ this.resourceBundleName =3D resourceBundleName;
+ }
}
\ No newline at end of file
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/templates/JahiaTemplatesPackageHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/templates/JahiaTemplatesPacka=
geHandler.java&rev=3D19145&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplatesPackageHandler.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplatesPackageHandler.java Wed Nov 14 10:46:06 2007
@@ -324,6 +324,10 @@
ch.dataElement("description", pkg.getDescription());
}
=
+ if (pkg.getResourceBundleName() !=3D null) {
+ ch.dataElement("resource-bundle", pkg.getResourceBundleNam=
e());
+ }
+
// common pages
if (pkg.getMySettingsPageName() !=3D null
|| pkg.getSearchResultsPageName() !=3D null) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/templates/Templates_Xml.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/templates/Templates_Xml.java&=
rev=3D19145&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/Templates_Xml.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/Templates_Xml.java Wed Nov 14 10:46:06 2007
@@ -137,6 +137,8 @@
digester.addBeanPropertySetter("template-set/thumbnail", "thumbnai=
l");
digester.addBeanPropertySetter("template-set/description",
"description");
+ digester.addBeanPropertySetter("template-set/resource-bundle",
+ "resourceBundleName");
=
digester.addSetProperties("template-set/templates", "homepage",
"homePageName");
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/xml=
_dtd/templates_2_0.xsd
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/xml_dtd/templates_2_0.xsd&rev=3D19=
145&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/xml_dtd/t=
emplates_2_0.xsd (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/xml_dtd/t=
emplates_2_0.xsd Wed Nov 14 10:46:06 2007
@@ -12,6 +12,7 @@
<element name=3D"provider" type=3D"string" minOccurs=3D"0"/>
<element name=3D"thumbnail" type=3D"jahia:imageFile" minOccurs=3D"=
0"/>
<element name=3D"description" type=3D"string" minOccurs=3D"0"/>
+ <element name=3D"resource-bundle" type=3D"string" minOccurs=3D"0"/>
<element name=3D"common-pages" minOccurs=3D"0">
<complexType>
<sequence>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
