Author: cziegeler
Date: Wed Feb 18 20:41:53 2009
New Revision: 745640
URL: http://svn.apache.org/viewvc?rev=745640&view=rev
Log:
SLING-517 - Remove unused node type.
Modified:
incubator/sling/trunk/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
incubator/sling/trunk/extensions/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd
Modified:
incubator/sling/trunk/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java?rev=745640&r1=745639&r2=745640&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
(original)
+++
incubator/sling/trunk/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
Wed Feb 18 20:41:53 2009
@@ -40,6 +40,8 @@
private static final String PROP_VALUE = "sling:message";
+ private static final String PROP_BASENAME = "sling:basename";
+
private static final String QUERY_BASE =
"//element(*,mix:language)[...@jcr:language='%s'%s]/*";
private static final String QUERY_LOAD_FULLY = QUERY_BASE + "/(@"
@@ -125,7 +127,7 @@
if (key == null) {
key = ResourceUtil.getName(jcrPath);
}
-
+
Map<String, Object> dst = rest;
for (int i = 0; i < path.length; i++) {
if (jcrPath.startsWith(path[i])) {
@@ -197,7 +199,8 @@
return "";
}
- StringBuffer buf = new StringBuffer(" and @sling:basename");
+ StringBuilder buf = new StringBuilder(" and @");
+ buf.append(PROP_BASENAME);
if (baseName.length() > 0) {
buf.append("='").append(baseName).append('\'');
Modified:
incubator/sling/trunk/extensions/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd?rev=745640&r1=745639&r2=745640&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd
(original)
+++
incubator/sling/trunk/extensions/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd
Wed Feb 18 20:41:53 2009
@@ -16,20 +16,8 @@
// specific language governing permissions and limitations
// under the License.
//
-
-<sling = 'http://sling.apache.org/jcr/sling/1.0'>
-<mix = 'http://www.jcp.org/jcr/mix/1.0'>
<sling = 'http://sling.apache.org/jcr/sling/1.0'>
-// The sling:language mixin node type allows to list one or more base
-// names of resource bundles to which the messages below this language
-// node belong.
-[sling:Language] > mix:language
- mixin
- - sling:basename (string)
- - sling:basename (string) multiple
-
-
// Mixin node type for a single key to message mapping
// This mixin node type may be applied to any node such, that mappings
// may be located just inside some existing node hierarchy
