cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r736648 - in /cxf/sandbox/dosgi/distribution: multi-bundle/ multi-bundle/src/main/resources/ single-bundle/ single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/ single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/
Date Thu, 22 Jan 2009 14:08:24 GMT
Author: davidb
Date: Thu Jan 22 06:08:24 2009
New Revision: 736648

URL: http://svn.apache.org/viewvc?rev=736648&view=rev
Log:
Moved from using Jetty directly (two bundles) to using the pax-web-service bundle.
The pax-web-service bundle contains Jetty as well, but additionally registers an OSGi HttpService.

Modified:
    cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
    cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
    cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
    cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
    cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java

Modified: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml?rev=736648&r1=736647&r2=736648&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml Thu Jan 22 06:08:24 2009
@@ -60,11 +60,6 @@
       <version>1.1.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
       <version>1.1.1</version>
@@ -115,14 +110,9 @@
       <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
+      <groupId>org.ops4j.pax.web</groupId>
+      <artifactId>pax-web-service</artifactId>
+      <version>0.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>

Modified: cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=736648&r1=736647&r2=736648&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml (original)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml Thu
Jan 22 06:08:24 2009
@@ -5,7 +5,6 @@
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/geronimo-servlet_2.5_spec-1.1.2.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-core-2.5.5.jar</bundle>
@@ -16,8 +15,7 @@
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-io-1.1.2.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-core-1.1.2.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/spring-osgi-extender-1.1.2.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/jetty-util-6.1.9.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/jetty-6.1.9.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/pax-web-service-0.5.1.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.specs.locator-1.1.1.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1_1.jar</bundle>

Modified: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/pom.xml?rev=736648&r1=736647&r2=736648&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/pom.xml Thu Jan 22 06:08:24 2009
@@ -60,11 +60,6 @@
       <version>1.1.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
       <version>1.1.1</version>
@@ -115,14 +110,9 @@
       <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
+      <groupId>org.ops4j.pax.web</groupId>
+      <artifactId>pax-web-service</artifactId>
+      <version>0.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>

Modified: cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list?rev=736648&r1=736647&r2=736648&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
(original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
Thu Jan 22 06:08:24 2009
@@ -1,3 +1,4 @@
+org.ops4j.pax.web.service.internal.Activator
 org.apache.cxf.dosgi.discovery.local.Activator
 org.apache.cxf.dosgi.dsw.Activator
 org.springframework.osgi.extender.internal.activator.ContextLoaderListener

Modified: cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java?rev=736648&r1=736647&r2=736648&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
(original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Thu Jan 22 06:08:24 2009
@@ -6,9 +6,10 @@
 
 public class AggregatedActivatorTest extends TestCase {
     public void testReadResourcesFile() throws Exception {
-        String[] expected = {"org.apache.cxf.dosgi.discovery.local.Activator",
+        String[] expected = {
+            "org.ops4j.pax.web.service.internal.Activator",
+            "org.apache.cxf.dosgi.discovery.local.Activator",
             "org.apache.cxf.dosgi.dsw.Activator",
-//            "org.apache.servicemix.specs.locator.Activator",
             "org.springframework.osgi.extender.internal.activator.ContextLoaderListener"};
         
         AggregatedActivator aa = new AggregatedActivator();



Mime
View raw message