X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=META-INF%2Fspring%2Forg.argeo.tp.apache.tomcat.xml;h=42f83aea990fee1476283550fd5826ec2a91ce68;hb=9bfc00c873a72c815c32b3131af87f1998009ab5;hp=23c2ebd0b9bdc8c656ed678730555e443c2234af;hpb=7883bc310f067ae00016e20b1d52d817eaa3ed1f;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 23c2ebd..42f83ae 100644
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -8,14 +8,53 @@
 	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>
 
-	<!-- SLF4J Factory -->
+	<!-- FACTORY -->
 	<bean id="template.org.apache.tomcat" parent="template.bndWrapper"
 		abstract="true">
 		<property name="groupId" value="org.argeo.tp.apache.tomcat" />
@@ -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>