X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.repo%2FMETA-INF%2Fspring%2Fmaven.xml;h=4b01d6194e090ae588afe29a986a00746cd0e996;hb=0f05a24d55e92b847d2c72ff116ecd281a60adf8;hp=d64933cdb45379db0313189a96b79966bb0fb7ab;hpb=a49b28f9f972f303961d40948b28604140ae3a83;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
index d64933cdb..4b01d6194 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
@@ -7,36 +7,30 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	">
 
+	<!-- <bean class="org.argeo.slc.repo.maven.ImportMavenDependencies" init-method="run"> 
+		<property name="rootCoordinates" value="org.argeo.dep:versions-all:pom:1.1.3-SNAPSHOT" 
+		/> <property name="distributionName" value="tp" /> <property name="aetherTemplate" 
+		ref="mavenAetherTemplate" /> <property name="jcrSession" ref="jcrSession" 
+		/> <property name="excludedArtifacts"> <set> <value>org.apache.commons:com.springsource.org.apache.commons.logging 
+		</value> <value>org.osgi:org.osgi.core</value> <value>org.easymock:easymock</value> 
+		<value>com.springsource.org.apache.xmlcommons</value> </set> </property> 
+		</bean> -->
 
-	<bean class="org.argeo.slc.repo.maven.ImportMavenDependencies" init-method="run">
-		<property name="rootCoordinates"
-			value="org.argeo.dep:versions-all:pom:1.1.3-SNAPSHOT" />
-		<property name="aetherTemplate" ref="mavenAetherTemplate" />
-		<property name="jcrSession" ref="jcrSession" />
-		<property name="excludedArtifacts">
-			<set>
-				<value>org.apache.commons:com.springsource.org.apache.commons.logging
-				</value>
-				<value>org.osgi:org.osgi.core</value>
-				<value>org.easymock:easymock</value>
-				<value>com.springsource.org.apache.xmlcommons</value>
-			</set>
-		</property>
-	</bean>
-
-	<bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate">
-		<property name="repositorySystem" ref="mavenRepositorySystem" />
-		<property name="repositorySystemSession" ref="mavenRepositorySystemSession" />
-		<property name="remoteRepositories" ref="defaultMavenRepositories" />
-	</bean>
+	<!-- <bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate"> -->
+	<!-- <property name="repositorySystem" ref="mavenRepositorySystem" /> -->
+	<!-- <property name="repositorySystemSession" ref="mavenRepositorySystemSession" 
+		/> -->
+	<!-- <property name="remoteRepositories" ref="defaultMavenRepositories" 
+		/> -->
+	<!-- </bean> -->
 
 	<!-- Remote repositories -->
 	<util:list id="defaultMavenRepositories">
+		<ref local="argeo-snapshots" />
+		<ref local="argeo" />
 		<ref local="central" />
 		<ref local="com.springsource.repository.bundles.external" />
 		<ref local="com.springsource.repository.bundles.release" />
-		<ref local="argeo" />
-		<ref local="argeo-snapshots" />
 	</util:list>
 
 	<bean id="central" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
@@ -51,10 +45,10 @@
 			value="http://repository.springsource.com/maven/bundles/external" />
 	</bean>
 	<bean id="argeo" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url" value="http://maven.argeo.org/argeo/" />
+		<property name="url" value="http://maven.argeo.org/argeo" />
 	</bean>
 	<bean id="argeo-snapshots" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-		<property name="url" value="http://dev.argeo.org/maven/argeo-snapshots/" />
+		<property name="url" value="http://dev.argeo.org/maven/argeo-snapshots" />
 	</bean>
 
 </beans>
\ No newline at end of file