Merge TP extras

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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index c33b55ce5b17a4597e4075c1d71cf052ad53069f..c1cb5b83598860b3c35a4b2d2a86cadfd2c6bae8 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- REGISTER -->
        <bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.10" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.14" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -38,6 +38,9 @@
                                <ref bean="apache/org.apache.ant" />
                                <ref bean="org.quartz-scheduler.quartz" />
                                <ref bean="org.quartz-scheduler.quartz.jobs" />
+                               <ref bean="bitronix.tm" />
+                               <ref bean="misc/org.w3c.css.sac"/>
+                               <ref bean="com.steadystate.css"/>
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -52,6 +55,10 @@
                                <ref bean="apache/org.apache.commons.exec" />
                                <ref bean="apache/org.apache.commons.jci" />
                                <ref bean="apache/org.apache.commons.compress" />
+                               
+                               <!-- Google -->
+                               <ref bean="com.google.guava" />
+                               <ref bean="com.google.gson" />
 
                                <!-- Eclipse -->
                                <ref bean="eclipse/org.argeo.tp.jetty" />
@@ -69,8 +76,19 @@
                                
                                <!-- Spring -->
                                <ref bean="spring/org.springframework" />
-                               <ref bean="org.springframework.ldap" />
-                               <ref bean="spring/org.springframework.security" />
+
+                               <!-- Document generation and management -->
+                               <ref bean="net.sf.jxl" />
+                               <ref bean="apache/org.apache.pdfbox" />
+                               <!-- Databases -->
+                               <ref bean="org.postgresql.postgresql" />
+                               <ref bean="org.dbunit" />
+                               <!-- ALM -->
+                               <ref bean="eclipse/org.eclipse.aether" />
+                               <ref bean="org.redline-rpm" />
+                               <!-- Needs https://code.google.com/p/javaewah/ -->
+                               <!-- <ref bean="org.eclipse.jgit" /> -->
+                               <ref bean="misc/org.tmatesoft.svnkit" />
                        </list>
                </property>
        </bean>
@@ -78,7 +96,7 @@
        <!-- Factory -->
        <bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
                init-method="init" destroy-method="destroy">
-               <property name="workspace" value="argeo-tp-2.1" />
+               <property name="workspace" value="argeo-2.1" />
                <property name="nodeIndexers">
                        <list>
                                <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
@@ -124,11 +142,11 @@
        <!-- Security -->
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <property name="authenticationManager" ref="authenticationManager" />
-               <property name="beanNames">
-                       <list>
-                               <value>osgiFactory</value>
-                       </list>
-               </property>
+<!--           <property name="beanNames"> -->
+<!--                   <list> -->
+<!--                           <value>osgiFactory</value> -->
+<!--                           <value>argeo-tp</value> -->
+<!--                   </list> -->
+<!--           </property> -->
        </bean>
 </beans>
\ No newline at end of file