Mark jcraft.jzlib as optionnal for jsch rather than adding it to the

[gpl/argeo-tp.git] / META-INF / spring / distribution.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 26e8395cbfec279c21068e3f0504adaa2421848a..2ae116c8ad8b31ff12eb31b5cddd7bd43dbc2733 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,13 +13,22 @@
                <constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
                <property name="modules">
                        <list>
-                               <ref bean="misc/org.apache.log4j" />
+                               <ref bean="apache/org.apache.log4j" />
                                <ref bean="misc/org.slf4j" />
-                               <!-- <ref bean="apache.tomcat/org.apache.tomcat" /> -->
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
+                               <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" />
@@ -29,6 +38,8 @@
                                <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" /> -->
@@ -45,6 +56,8 @@
                                <!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
                                <!-- 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>
@@ -57,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">