servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r636227 - in /servicemix/smx4/features/trunk: ./ assembly/ assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/ ejb3/bundles/cxf/
Date Wed, 12 Mar 2008 07:07:25 GMT
Author: gnodet
Date: Wed Mar 12 00:07:23 2008
New Revision: 636227

URL: http://svn.apache.org/viewvc?rev=636227&view=rev
Log:
Improve CXF bundle, add jetty bundles and swicth to pax-web-bundle (which does not include
jetty)

Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
    servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Mar 12 00:07:23 2008
@@ -178,6 +178,11 @@
             <version>${version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-classloader</artifactId>
+            <version>${xbean.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-extender</artifactId>
             <version>${spring.osgi.version}</version>
@@ -319,7 +324,7 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-service</artifactId>
+            <artifactId>pax-web-bundle</artifactId>
             <version>${pax.web.version}</version>
         </dependency>
         <dependency>
@@ -341,6 +346,16 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
             <version>${felix.prefs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
     </dependencies>
     <build>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Mar 12 00:07:23
2008
@@ -108,6 +108,7 @@
                 <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
                 <include>org.apache.felix:org.apache.felix.prefs</include>
+                <include>org.apache.xbean:xbean-classloader</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
@@ -143,7 +144,9 @@
                 <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
 
                 <!-- WEB / WAR -->
-                <include>org.ops4j.pax.web:pax-web-service</include>
+                <include>org.mortbay.jetty:jetty-util</include>
+                <include>org.mortbay.jetty:jetty</include>
+                <include>org.ops4j.pax.web:pax-web-bundle</include>
                 <include>org.ops4j.pax.web:pax-web-jsp</include>
                 <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
                 <include>org.ops4j.pax.url:pax-url-war</include>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Mar 12
00:07:23 2008
@@ -99,6 +99,7 @@
                 <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
                 <include>org.apache.felix:org.apache.felix.prefs</include>
+                <include>org.apache.xbean:xbean-classloader</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
                 <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
@@ -134,7 +135,9 @@
                 <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
 
                 <!-- WEB / WAR -->
-                <include>org.ops4j.pax.web:pax-web-service</include>
+                <include>org.mortbay.jetty:jetty-util</include>
+                <include>org.mortbay.jetty:jetty</include>
+                <include>org.ops4j.pax.web:pax-web-bundle</include>
                 <include>org.ops4j.pax.web:pax-web-jsp</include>
                 <include>org.ops4j.pax.web-extender:pax-web-ex-war</include>
                 <include>org.ops4j.pax.url:pax-url-war</include>

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Wed Mar 12 00:07:23 2008
@@ -55,6 +55,7 @@
 org.apache.servicemix.kernel.spring-${servicemix.kernel.version}.jar=50
 
 org.apache.felix.prefs-${felix.prefs.version}.jar=30
+xbean-classloader-${xbean.version}.jar=50
 org.apache.servicemix.nmr.api-${servicemix.nmr.version}.jar=50
 org.apache.servicemix.nmr.commands-${servicemix.nmr.version}.jar=50
 org.apache.servicemix.nmr.core-${servicemix.nmr.version}.jar=50
@@ -86,7 +87,9 @@
 spring-web-${spring.version}.jar=50
 org.apache.servicemix.activemq-${version}.jar=50
 
-pax-web-service-${pax.web.version}.jar=50
+jetty-${jetty.version}.jar=50
+jetty-util-${jetty.version}.jar=50
+pax-web-bundle-${pax.web.version}.jar=50
 pax-web-jsp-${pax.web.version}.jar=50
 pax-web-ex-war-${pax.web.extender.version}.jar=50
 pax-url-war-${pax.url.version}.jar=50

Modified: servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/ejb3/bundles/cxf/pom.xml Wed Mar 12 00:07:23 2008
@@ -42,6 +42,7 @@
 		<servicemix.osgi.export>
             org.apache.cxf*;version=${pkgVersion};-split-package:=merge-first,
             org.xmlsoap.schemas*;version=${pkgVersion};-split-package:=merge-first,
+            '=META-INF.cxf'
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             com.ibm*;resolution:=optional,
@@ -65,7 +66,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            META-INF*;-split-package:=merge-first
+            META-INF*;-split-package:=merge-first,
             schemas*;-split-package:=merge-first
         </servicemix.osgi.private.pkg>
     </properties>
@@ -99,5 +100,32 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${servicemix.osgi.export}</Export-Package>
+                        <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
+                        <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+                        <_exportcontents>META-INF.cxf</_exportcontents>
+                        <_failok>true</_failok>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=636227&r1=636226&r2=636227&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Mar 12 00:07:23 2008
@@ -101,6 +101,7 @@
       <jaxb.impl.version>2.0.3</jaxb.impl.version>
       <jaxws.api.version>2.0</jaxws.api.version>
       <jencks.version>2.1</jencks.version>
+      <jetty.version>6.1.8</jetty.version>
       <jline.version>0.9.93</jline.version>
       <junit.version>4.4</junit.version>
       <log4j.version>1.2.14</log4j.version>
@@ -109,10 +110,10 @@
       <openjpa.version>1.0.1</openjpa.version>
       <pax.logging.version>1.0.0</pax.logging.version>
       <pax.url.version>0.3.0</pax.url.version>
-      <pax.web.version>0.3.1</pax.web.version>
+      <pax.web.version>0.4.0-SNAPSHOT</pax.web.version>
       <pax.web.extender.version>0.3.0</pax.web.extender.version>
       <servicemix.kernel.version>1.0-m2</servicemix.kernel.version>
-      <servicemix.nmr.version>1.0-m1-SNAPSHOT</servicemix.nmr.version>
+      <servicemix.nmr.version>1.0-m2-SNAPSHOT</servicemix.nmr.version>
       <spring.version>2.5.1</spring.version>
       <spring.osgi.version>1.0</spring.osgi.version>
       <xstream.version>1.2.2</xstream.version>



Mime
View raw message