Replace alias by cn

git-svn-id: https://svn.argeo.org/slc/trunk@9238 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
index f6d6a3e66e5991f1478d574b3d38c9216348090a..099ecd5813522d0c58fff23f6ca2daed8cdd83fc 100644 (file)
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
@@ -14,5 +14,5 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="repository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=slc)" />\r
+               filter="(cn=slc)" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml
index 39ecd5612872e424cfbfe7404343eecc071f1a1f..593cf1d9cb376ad02092f94082d3f123dfff8c21 100644 (file)
--- a/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml
+++ b/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml
@@ -11,7 +11,7 @@
 \r
        <!-- REFERENCES -->\r
 <!--   <reference id="javaRepository" interface="javax.jcr.Repository" -->\r
-<!--           filter="(argeo.jcr.repository.alias=java)" /> -->\r
+<!--           filter="(cn=java)" /> -->\r
 \r
        <!-- Maven -->\r
 <!--   <reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem" -->\r

diff --git a/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml
index a28d7d697856d8744bff07442edeed7b430d881e..56f3b350e41074b646291af522542b1ae0c4f819 100644 (file)
--- a/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml
+++ b/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml
@@ -14,5 +14,5 @@
        <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
        <!-- TODO inject this in a cleaner way -->\r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=java)" />\r
+               filter="(cn=java)" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml b/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
index 9362f10f33093f1a856f1f55f9413ae5350b2695..b5f913eb85901ee1e8213f74f6ff61a91e718887 100644 (file)
--- a/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
+++ b/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
@@ -11,7 +11,7 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="repository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=slc)" />\r
+               filter="(cn=slc)" />\r
 \r
 <!--   <reference id="authenticationManager" -->\r
 <!--           interface="org.springframework.security.authentication.AuthenticationManager" /> -->\r

diff --git a/org.argeo.slc.client.rap/META-INF/spring/osgi.xml b/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
index 96cd21505a56fc0fc695b3e7d40e5a37649d202c..5962ec434410ee96770c3bc548c72cb177168efd 100644 (file)
--- a/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
@@ -11,7 +11,7 @@
        <beans:description>SLC UI RAP</beans:description>\r
 \r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=node)" />\r
+               filter="(cn=node)" />\r
 \r
        <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
        <reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />\r

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
index dec9c603c4cff6c0be53ab2fbf203e7fe8fef016..2187ea25702c506ce7c37ac1fa7ff9353f6bc060 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
@@ -9,13 +9,13 @@
        osgi:default-timeout="30000">\r
 \r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=java)" />\r
+               filter="(cn=java)" />\r
 \r
        <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
        <reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />\r
 \r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=home)" />\r
+               filter="(cn=home)" />\r
 \r
        <reference id="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index bedda8da590956d0dab305e1d59ae889aeb072c4..b27a065599635e2763a700361b4baeebe94cb981 100644 (file)
--- a/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -12,7 +12,7 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="repository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=home)" />\r
+               filter="(cn=home)" />\r
 \r
        <reference id="agent" interface="org.argeo.slc.execution.SlcAgent" />\r
 \r

diff --git a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index af033c6f1e511777d2260e7fcecf63b62529154a..f0fcaaa4f84b99fec1300aff1d8a0bc45857ae9f 100644 (file)
--- a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -16,33 +16,33 @@
                interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
 \r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=java)" />\r
+               filter="(cn=java)" />\r
        <reference id="distRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=dist)" />\r
+               filter="(cn=dist)" />\r
        <reference id="rpmRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=rpm)" />\r
+               filter="(cn=rpm)" />\r
        <reference id="docsRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=docs)" />\r
+               filter="(cn=docs)" />\r
 \r
        <!-- SERVICES -->\r
 <!--   <service ref="javaRepository" interface="javax.jcr.Repository"> -->\r
 <!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="java" /> -->\r
+<!--                   <beans:entry key="cn" value="java" /> -->\r
 <!--           </service-properties> -->\r
 <!--   </service> -->\r
 <!--   <service ref="distRepository" interface="javax.jcr.Repository"> -->\r
 <!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->\r
+<!--                   <beans:entry key="cn" value="dist" /> -->\r
 <!--           </service-properties> -->\r
 <!--   </service> -->\r
 <!--   <service ref="rpmRepository" interface="javax.jcr.Repository"> -->\r
 <!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->\r
+<!--                   <beans:entry key="cn" value="rpm" /> -->\r
 <!--           </service-properties> -->\r
 <!--   </service> -->\r
 <!--   <service ref="docsRepository" interface="javax.jcr.Repository"> -->\r
 <!--           <service-properties> -->\r
-<!--                   <beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->\r
+<!--                   <beans:entry key="cn" value="docs" /> -->\r
 <!--           </service-properties> -->\r
 <!--   </service> -->\r
 \r