Author: ieb
Date: Thu Apr 8 00:46:44 2010
New Revision: 931739
URL: http://svn.apache.org/viewvc?rev=931739&view=rev
Log:
SLING-1470 moved redirect.cnd to the resources bundle as per dicussion
referenced in issue. Build and tests all pass.
Added:
sling/trunk/bundles/jcr/resource/src/main/resources/SLING-INF/nodetypes/redirect.cnd
- copied, changed from r931611,
sling/trunk/bundles/servlets/get/src/main/resources/SLING-INF/nodetypes/redirect.cnd
Removed:
sling/trunk/bundles/servlets/get/src/main/resources/SLING-INF/nodetypes/redirect.cnd
Modified:
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/servlets/get/pom.xml
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=931739&r1=931738&r2=931739&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Thu Apr 8 00:46:44 2010
@@ -94,6 +94,7 @@
SLING-INF/nodetypes/folder.cnd,
SLING-INF/nodetypes/resource.cnd,
SLING-INF/nodetypes/vanitypath.cnd,
+ SLING-INF/nodetypes/redirect.cnd,
SLING-INF/nodetypes/mapping.cnd
</Sling-Nodetypes>
</instructions>
Copied:
sling/trunk/bundles/jcr/resource/src/main/resources/SLING-INF/nodetypes/redirect.cnd
(from r931611,
sling/trunk/bundles/servlets/get/src/main/resources/SLING-INF/nodetypes/redirect.cnd)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/resources/SLING-INF/nodetypes/redirect.cnd?p2=sling/trunk/bundles/jcr/resource/src/main/resources/SLING-INF/nodetypes/redirect.cnd&p1=sling/trunk/bundles/servlets/get/src/main/resources/SLING-INF/nodetypes/redirect.cnd&r1=931611&r2=931739&rev=931739&view=diff
==============================================================================
(empty)
Modified: sling/trunk/bundles/servlets/get/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=931739&r1=931738&r2=931739&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/get/pom.xml (original)
+++ sling/trunk/bundles/servlets/get/pom.xml Thu Apr 8 00:46:44 2010
@@ -59,9 +59,6 @@
org.apache.sling.servlets.get.*
</Private-Package>
- <Sling-Nodetypes>
- SLING-INF/nodetypes/redirect.cnd
- </Sling-Nodetypes>
</instructions>
</configuration>
</plugin>