Improve defualt repository declaration

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

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 4b01d6194e090ae588afe29a986a00746cd0e996..89e98f67266a9069f4097d1ec9c415ce0500eee2 100644 (file)
--- 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,24 +7,7 @@
        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 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 -->
+       <!-- Proxied repositories -->
        <util:list id="defaultMavenRepositories">
                <ref local="argeo-snapshots" />
                <ref local="argeo" />
@@ -33,22 +16,25 @@
                <ref local="com.springsource.repository.bundles.release" />
        </util:list>
 
-       <bean id="central" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url" value="http://repo1.maven.org/maven2" />
-       </bean>
-       <bean id="com.springsource.repository.bundles.release" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url"
-                       value="http://repository.springsource.com/maven/bundles/release" />
-       </bean>
-       <bean id="com.springsource.repository.bundles.external" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url"
-                       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" />
-       </bean>
-       <bean id="argeo-snapshots" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url" value="http://dev.argeo.org/maven/argeo-snapshots" />
-       </bean>
+<!--   <bean id="localrepo" p:url="http://localrepo:7080/org.argeo.slc.repo.webapp/maven" -->
+<!--           p:username="root" p:password="demo" -->
+<!--           class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" /> -->
+
+       <bean id="central" p:url="http://repo1.maven.org/maven2"
+               class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" />
+
+       <bean id="com.springsource.repository.bundles.release"
+               p:url="http://repository.springsource.com/maven/bundles/release"
+               class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" />
+
+       <bean id="com.springsource.repository.bundles.external"
+               p:url="http://repository.springsource.com/maven/bundles/external"
+               class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" />
+
+       <bean id="argeo" p:url="http://maven.argeo.org/argeo"
+               class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" />
+
+       <bean id="argeo-snapshots" p:url="http://dev.argeo.org/maven/argeo-snapshots"
+               class="org.argeo.slc.aether.spring.RemoteRepositoryFactory" />
 
 </beans>
\ No newline at end of file