Clean up and refactor

[gpl/argeo-tp.git] / META-INF / spring / org.argeo.tp.apache.tomcat.xml

diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 712437fb3353619234c4872c17d5260235b80f5c..42f83aea990fee1476283550fd5826ec2a91ce68 100644 (file)
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -8,12 +8,51 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
        <!-- REGISTER -->
-       <bean id="org.apache.catalina" parent="template.org.apache.tomcat" />
-       <bean id="org.apache.jasper" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.catalina" parent="template.org.apache.tomcat">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       javax.mail.*;resolution:=optional,
+                                       org.apache.juli.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+       <bean id="org.apache.jasper" parent="template.org.apache.tomcat">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       org.apache.juli.logging;resolution:=optional,
+                                       org.apache.tools.ant.*;resolution:=optional,
+                                       org.eclipse.jdt.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
        <bean id="org.apache.el" parent="template.org.apache.tomcat" />
-       <bean id="org.apache.coyote" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.coyote" parent="template.org.apache.tomcat">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       *,
+                                       org.apache.juli.logging;resolution:=optional,
+                               </prop>
+                       </props>
+               </property>
+       </bean>
        <bean id="org.apache.tomcat.api" parent="template.org.apache.tomcat" />
-       <bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat" />
+       <bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       org.apache.juli.logging;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
 
        <!-- FACTORY -->
        <bean id="template.org.apache.tomcat" parent="template.bndWrapper"
@@ -27,6 +66,9 @@
                <bean parent="template.archiveWrapper">
                        <property name="uri"
                                value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/bin/apache-tomcat-@{version}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
                        <property name="wrappers">
                                <map>
                                        <!-- Tomcat -->
@@ -53,6 +95,14 @@
                                                value-ref="javax.servlet" />
                                </map>
                        </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/src/apache-tomcat-@{version}-src.zip" />
+                                       <property name="base" value="apache-tomcat-@{version}-src/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
                </bean>
        </flow:flow>