From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 1 Oct 2016 19:16:27 +0000 (+0000)
Subject: Replace alias by cn
X-Git-Tag: argeo-slc-2.1.7~18
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=11d089668384ffa1a034558a99a89eeb3aed8392;p=gpl%2Fargeo-slc.git

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 f6d6a3e66..099ecd581 100644
--- 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 @@
 
 	<!-- REFERENCES -->
 	<reference id="repository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=slc)" />
+		filter="(cn=slc)" />
 </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 39ecd5612..593cf1d9c 100644
--- 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 @@
 
 	<!-- REFERENCES -->
 <!-- 	<reference id="javaRepository" interface="javax.jcr.Repository" -->
-<!-- 		filter="(argeo.jcr.repository.alias=java)" /> -->
+<!-- 		filter="(cn=java)" /> -->
 
 	<!-- Maven -->
 <!-- 	<reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem" -->
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 a28d7d697..56f3b350e 100644
--- 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" />
 	<!-- TODO inject this in a cleaner way -->
 	<reference id="javaRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=java)" />
+		filter="(cn=java)" />
 </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 9362f10f3..b5f913eb8 100644
--- 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 @@
 
 	<!-- REFERENCES -->
 	<reference id="repository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=slc)" />
+		filter="(cn=slc)" />
 
 <!-- 	<reference id="authenticationManager" -->
 <!-- 		interface="org.springframework.security.authentication.AuthenticationManager" /> -->
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 96cd21505..5962ec434 100644
--- 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>
 
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=node)" />
+		filter="(cn=node)" />
 
 	<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
 	<reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />
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 dec9c603c..2187ea257 100644
--- 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">
 
 	<reference id="javaRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=java)" />
+		filter="(cn=java)" />
 
 	<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
 	<reference id="keyring" interface="org.argeo.node.security.CryptoKeyring" />
 
 	<reference id="nodeRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=home)" />
+		filter="(cn=home)" />
 
 	<reference id="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />
 </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 bedda8da5..b27a06559 100644
--- 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 @@
 
 	<!-- REFERENCES -->
 	<reference id="repository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=home)" />
+		filter="(cn=home)" />
 
 	<reference id="agent" interface="org.argeo.slc.execution.SlcAgent" />
 
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 af033c6f1..f0fcaaa4f 100644
--- 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" />
 
 	<reference id="javaRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=java)" />
+		filter="(cn=java)" />
 	<reference id="distRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=dist)" />
+		filter="(cn=dist)" />
 	<reference id="rpmRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=rpm)" />
+		filter="(cn=rpm)" />
 	<reference id="docsRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=docs)" />
+		filter="(cn=docs)" />
 
 	<!-- SERVICES -->
 <!-- 	<service ref="javaRepository" interface="javax.jcr.Repository"> -->
 <!-- 		<service-properties> -->
-<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="java" /> -->
+<!-- 			<beans:entry key="cn" value="java" /> -->
 <!-- 		</service-properties> -->
 <!-- 	</service> -->
 <!-- 	<service ref="distRepository" interface="javax.jcr.Repository"> -->
 <!-- 		<service-properties> -->
-<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->
+<!-- 			<beans:entry key="cn" value="dist" /> -->
 <!-- 		</service-properties> -->
 <!-- 	</service> -->
 <!-- 	<service ref="rpmRepository" interface="javax.jcr.Repository"> -->
 <!-- 		<service-properties> -->
-<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->
+<!-- 			<beans:entry key="cn" value="rpm" /> -->
 <!-- 		</service-properties> -->
 <!-- 	</service> -->
 <!-- 	<service ref="docsRepository" interface="javax.jcr.Repository"> -->
 <!-- 		<service-properties> -->
-<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->
+<!-- 			<beans:entry key="cn" value="docs" /> -->
 <!-- 		</service-properties> -->
 <!-- 	</service> -->