Adapt to changes in SLC

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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 4329111804571269cce068c98137708076c2c0ca..db233c90df927f0412ba7a03430adbc25a45278e 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -12,11 +12,12 @@
                init-method="init" destroy-method="destroy">
                <constructor-arg value="org.argeo.tp:org.argeo.tp:2.1.1" />
                <property name="modules">
-                       <set>
-                               <!-- <ref bean="org.slf4j.log4j12" /> -->
-                               <!-- <ref bean="org.slf4j.api" /> -->
-                               <!-- <ref bean="org.slf4j.commons.logging" /> -->
-                       </set>
+                       <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="org.argeo.tp.spring/org.springframework" />
+                       </list>
                </property>
        </bean>
 
@@ -55,8 +56,10 @@
                <property name="osgiFactory" ref="osgiFactory" />
        </bean>
 
+       <!-- Must be a prototype since wrapper are stateful objects, properties 
+               such as version can be set by caller. -->
        <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
-               abstract="true">
+               abstract="true" scope="prototype">
                <property name="bndProperties">
                        <props>
                                <prop key="Export-Package">*</prop>