Improve OSGi packaging

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 878629e6496df07314fd5e0576ad6e75abc4c6a0..dbeed98b9863e140e9b6d8cfe23ba8c30344fcb7 100644 (file)
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -22,11 +22,24 @@
                        <property name="bndProperties">
                                <props merge="true">
                                        <prop key="Fragment-Host"><![CDATA[org.apache.jackrabbit.core]]></prop>
+                                       <prop key="Import-Package"><![CDATA[
+EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+org.apache.jackrabbit.test;resolution:=optional,
+*]]></prop>
                                </props>
                        </property>
                </bean>
                <bean id="org.apache.jackrabbit.core" parent="template.jackrabbitMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}" />
+                       p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Import-Package"><![CDATA[
+EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+org.apache.jackrabbit.test;resolution:=optional,
+*]]></prop>
+                               </props>
+                       </property>
+               </bean>
                <bean id="org.apache.jackrabbit.jcr.client" parent="template.jackrabbitMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-client:@{version}" />
                <bean id="org.apache.jackrabbit.jcr.server" parent="template.jackrabbitMaven"
@@ -39,8 +52,20 @@
                        p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi2jcr:@{version}" />
                <bean id="org.apache.jackrabbit.jcr2dav" parent="template.jackrabbitMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2dav:@{version}" />
+               <bean id="org.apache.jackrabbit.jcr2spi" parent="template.jackrabbitMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr2spi:@{version}" />
                <bean id="org.apache.jackrabbit.webapp" parent="template.jackrabbitMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-webapp:@{version}" />
+               <bean id="org.apache.jackrabbit.test" parent="template.jackrabbitMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-tests:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Import-Package"><![CDATA[
+EDU.oswego.cs.dl.util.concurrent;resolution:=optional,
+*]]></prop>
+                               </props>
+                       </property>
+               </bean>
        </flow:flow>
 
        <bean id="template.jackrabbitMaven" parent="template.mavenWrapper"

diff --git a/META-INF/spring/apache.tomcat.xml b/META-INF/spring/apache.tomcat.xml
index 2dbe87fbddcbc89c6b561f98409bd6d6bbfeb4b0..894cb7d3fdff23c22efb8968c442bbe619aad78e 100644 (file)
--- a/META-INF/spring/apache.tomcat.xml
+++ b/META-INF/spring/apache.tomcat.xml
@@ -60,8 +60,7 @@
                <property name="groupId" value="org.argeo.tp.apache.tomcat" />
        </bean>
 
-       <flow:flow name="apache/org.apache.tomcat"
-               spec="spec.version">
+       <flow:flow name="apache/org.apache.tomcat" spec="spec.version">
                <flow:arg name="version" value="7.0.42" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
@@ -72,27 +71,27 @@
                        <property name="wrappers">
                                <map>
                                        <!-- Tomcat -->
-                                       <entry key="apache-tomcat-@{version}/lib/catalina.jar"
-                                               value-ref="org.apache.catalina" />
-                                       <entry key="apache-tomcat-@{version}/lib/jasper.jar"
-                                               value-ref="org.apache.jasper" />
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/catalina.jar" -->
+                                       <!-- value-ref="org.apache.catalina" /> -->
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/jasper.jar" -->
+                                       <!-- value-ref="org.apache.jasper" /> -->
                                        <entry key="apache-tomcat-@{version}/lib/jasper-el.jar"
                                                value-ref="org.apache.el" />
-                                       <entry key="apache-tomcat-@{version}/lib/tomcat-coyote.jar"
-                                               value-ref="org.apache.coyote" />
-                                       <entry key="apache-tomcat-@{version}/lib/tomcat-api.jar"
-                                               value-ref="org.apache.tomcat.api" />
-                                       <entry key="apache-tomcat-@{version}/lib/tomcat-util.jar"
-                                               value-ref="org.apache.tomcat.util" />
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-coyote.jar" -->
+                                       <!-- value-ref="org.apache.coyote" /> -->
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-api.jar" -->
+                                       <!-- value-ref="org.apache.tomcat.api" /> -->
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-util.jar" -->
+                                       <!-- value-ref="org.apache.tomcat.util" /> -->
                                        <!-- Javax -->
                                        <entry key="apache-tomcat-@{version}/lib/annotations-api.jar"
                                                value-ref="javax.annotation" />
-                                       <entry key="apache-tomcat-@{version}/lib/el-api.jar"
-                                               value-ref="javax.el" />
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/el-api.jar" -->
+                                       <!-- value-ref="javax.el" /> -->
                                        <entry key="apache-tomcat-@{version}/lib/jsp-api.jar"
                                                value-ref="javax.servlet.jsp" />
-                                       <entry key="apache-tomcat-@{version}/lib/servlet-api.jar"
-                                               value-ref="javax.servlet" />
+                                       <!-- <entry key="apache-tomcat-@{version}/lib/servlet-api.jar" -->
+                                       <!-- value-ref="javax.servlet" /> -->
                                </map>
                        </property>
                        <property name="sourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 1f23fa8d34c6c7901d1e6cb97f6e5cdecc80092b..2dc77a855a0f06bfaa92c6d40d99f62ea956829d 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -15,9 +15,12 @@
                        <list>
                                <ref bean="apache/org.apache.log4j" />
                                <ref bean="misc/org.slf4j" />
-                               <!-- <ref bean="apache.tomcat/org.apache.tomcat" /> -->
+                               <ref bean="apache/org.apache.tomcat" />
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
+                               <ref bean="org.h2" />
+                               <ref bean="javax.el" />
+                               <ref bean="javax.inject" />
                                <ref bean="misc/org.aspectj" />
                                <ref bean="misc/org.bouncycastle" />
                                <ref bean="spring/org.springframework" />

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 3a2ff20aa5e69c42c878118f4725ca900c4dcaad..a6701ab3d98ec09257b1aef6dcccb9b9f13cb5a1 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -9,13 +9,16 @@
 
        <!-- REGISTER -->
        <bean id="javax.annotation" p:version="3.0.0" parent="template.javax" />
-       <bean id="javax.el" p:version="2.2.0" parent="template.javax" />
-       <bean id="javax.servlet" p:version="3.0.0" parent="template.javax" />
+       <!-- <bean id="javax.el" p:version="2.2.0" parent="template.javax" /> -->
+       <!-- <bean id="javax.servlet" p:version="3.0.0" parent="template.javax" 
+               /> -->
        <bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" />
 
-       <bean id="javax.inject" flow:as-flow="javax/javax.inject"
-               p:version="1.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.inject:javax.inject:1"
-               parent="template.mavenWrapper" />
+       <bean id="javax.inject" p:version="1.0.0" p:groupId="org.argeo.tp.javax"
+               p:sourceCoords="javax.inject:javax.inject:1" parent="template.mavenWrapper" />
+
+       <bean id="javax.el" p:version="2.2.5" p:groupId="org.argeo.tp.javax"
+               p:sourceCoords="javax.el:javax.el-api:2.2.5" parent="template.mavenWrapper" />
 
        <bean id="javax.jcr" flow:as-flow="javax/javax.jcr" p:version="2.0.0"
                p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 70af27148a604737140fe24d8232b6574eeea6f8..bb210237aab69564d289b9b4bf3668cb6f2c5721 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -12,8 +12,8 @@
                <property name="bndProperties">
                        <props merge="true">
                                <prop key="Import-Package">
-                                       *,
                                        com.bea.jvm;resolution:=optional,
+                                       *
                                </prop>
                        </props>
                </property>
@@ -34,6 +34,23 @@
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                </property>
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       org.hamcrest;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+       <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.184"
+               parent="template.mavenWrapper">
+               <property name="doNotModify" value="true" />
+               <!-- <property name="doNotModifySources" value="true" /> -->
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+               </property>
        </bean>
 
        <!-- AspectJ Factory -->