X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=2ae116c8ad8b31ff12eb31b5cddd7bd43dbc2733;hb=1434522acfcc29690ddd23aa8e122c0ef0710dc6;hp=dca4302d1a159ab73c119f9c2306b977c7000ac1;hpb=fb71a8c62deecc47a8bc6ad707676d7bb223daee;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index dca4302..2ae116c 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,21 +13,33 @@
 		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
 		<property name="modules">
 			<list>
-				<ref bean="org.argeo.tp/org.apache.log4j" />
-				<ref bean="org.argeo.tp/org.slf4j" />
-				<!-- <ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" /> -->
+				<ref bean="apache/org.apache.log4j" />
+				<ref bean="misc/org.slf4j" />
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
-				<ref bean="org.argeo.tp/org.aspectj" />
-				<ref bean="org.argeo.tp.spring/org.springframework" />
-				<ref bean="org.argeo.tp.apache.ant/org.apache.ant" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.io" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.fileupload" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.collections" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.dbcp" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.pool" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.codec" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.httpclient" />
+				<ref bean="org.h2" />
+				<ref bean="joda-time" />
+				<!-- This has been defined as optional via bnd -->
+				<!--   <ref bean="com.jcraft.jzlib" /> -->
+				<ref bean="com.jcraft.jsch" />
+				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
+				<ref bean="javax.el" />
+				<ref bean="javax.inject" />
+				<ref bean="misc/org.aspectj" />
+				<ref bean="misc/org.bouncycastle" />
+				<ref bean="spring/org.springframework" />
+				<ref bean="org.springframework.ldap" />
+				<ref bean="spring/org.springframework.security" />
+				<ref bean="apache/org.apache.ant" />
+				<ref bean="apache/org.apache.commons.io" />
+				<ref bean="apache/org.apache.commons.fileupload" />
+				<ref bean="apache/org.apache.commons.collections" />
+				<ref bean="apache/org.apache.commons.dbcp" />
+				<ref bean="apache/org.apache.commons.pool" />
+				<ref bean="apache/org.apache.commons.codec" />
+				<ref bean="apache/org.apache.commons.httpclient" />
+				<ref bean="apache/org.apache.commons.vfs" />
+				<ref bean="apache/org.apache.commons.exec" />
 				<!-- Felix -->
 				<!-- <ref bean="org.apache.felix.framework" /> -->
 				<!-- <ref bean="org.apache.felix.bundlerepository" /> -->
@@ -35,16 +47,18 @@
 				<!-- <ref bean="org.apache.felix.gogo.runtime" /> -->
 				<!-- <ref bean="org.apache.felix.gogo.shell" /> -->
 				<!-- Eclipse -->
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.jetty" />
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.equinox" />
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.gemini" />
+				<ref bean="eclipse/org.argeo.tp.jetty" />
+				<ref bean="eclipse/org.argeo.tp.equinox" />
+				<ref bean="eclipse/org.argeo.tp.gemini" />
 				<!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.core" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
 				<!-- Jackrabbit -->
-				<ref bean="org.argeo.tp.javax/javax.jcr" />
-<!-- 				<ref bean="org.argeo.tp.apache/org.apache.jackrabbit" /> -->
+				<ref bean="javax/javax.jcr" />
+				<ref bean="apache/org.apache.tika" />
+				<ref bean="apache/org.apache.lucene" />
+				<ref bean="apache/org.apache.jackrabbit" />
 			</list>
 		</property>
 	</bean>
@@ -56,9 +70,9 @@
 		<property name="nodeIndexers">
 			<list>
 				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
 				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
 			</list>
 		</property>
 		<property name="mirrors">