cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r820002 - in /cxf/branches/2.2.x-fixes: ./ rt/ rt/transports/http-osgi/ rt/transports/http-osgi/src/main/java/org/apache/cxf/ rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/ rt/transports/http-osgi/src/main/java/org/apache/c...
Date Tue, 29 Sep 2009 15:57:44 GMT
Author: dkulp
Date: Tue Sep 29 15:57:43 2009
New Revision: 820002

URL: http://svn.apache.org/viewvc?rev=820002&view=rev
Log:
Merged revisions 819982 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r819982 | dkulp | 2009-09-29 11:27:00 -0400 (Tue, 29 Sep 2009) | 1 line
  
  re-package the osgi transport
........

Added:
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestinationRegistry.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestinationRegistry.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServlet.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiServlet.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/SpringOsgiServlet.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/SpringOsgiServlet.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/
      - copied from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiDestinationTest.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiServletTest.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiServletTest.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
      - copied unchanged from r819982, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
Removed:
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestination.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/pom.xml?rev=820002&r1=820001&r2=820002&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/pom.xml Tue Sep 29 15:57:43 2009
@@ -45,6 +45,7 @@
         <module>frontend/js</module>
         <module>transports/http</module>
         <module>transports/http-jetty</module>
+        <module>transports/http-osgi</module>
         <module>transports/jms</module>
         <module>transports/jbi</module>
         <module>ws/policy</module>

Modified: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml?rev=820002&r1=820001&r2=820002&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml Tue Sep 29 15:57:43 2009
@@ -39,6 +39,16 @@
             <artifactId>org.osgi.compendium</artifactId>
             <version>1.2.0</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -46,20 +56,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -96,7 +95,7 @@
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.servicemix.cxf.transport.http_osgi,
+                            org.apache.cxf.transport.http_osgi,
                             '=META-INF.cxf.osgi'
                         </Export-Package>
                         <_failok>true</_failok>

Modified: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml?rev=820002&r1=820001&r2=820002&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
Tue Sep 29 15:57:43 2009
@@ -24,8 +24,8 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
-    <bean id="org.apache.servicemix.cxf.transport.http_osgi.OsgiTransportFactory"
-          class="org.apache.servicemix.cxf.transport.http_osgi.OsgiTransportFactory"
+    <bean id="org.apache.cxf.transport.http_osgi.OsgiTransportFactory"
+          class="org.apache.cxf.transport.http_osgi.OsgiTransportFactory"
           init-method="init">
 
         <property name="bus" ref="cxf"/>
@@ -43,6 +43,6 @@
     </bean>
 
     <osgi:reference id="osgiDestinationRegistry"
-                    interface="org.apache.servicemix.cxf.transport.http_osgi.OsgiDestinationRegistryIntf"
/>
+                    interface="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistryIntf"
/>
 
 </beans>

Modified: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml?rev=820002&r1=820001&r2=820002&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Tue Sep 29 15:57:43 2009
@@ -24,9 +24,9 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/osgi  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
-    <bean id="destinationRegistry" class="org.apache.servicemix.cxf.transport.http_osgi.OsgiDestinationRegistry"
/>
+    <bean id="destinationRegistry" class="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistry"
/>
 
-    <bean id="osgiServlet" class="org.apache.servicemix.cxf.transport.http_osgi.SpringOsgiServlet">
+    <bean id="osgiServlet" class="org.apache.cxf.transport.http_osgi.SpringOsgiServlet">
         <constructor-arg ref="destinationRegistry"/>
     </bean>
 
@@ -37,7 +37,7 @@
         </osgi:service-properties>
     </osgi:service>
 
-    <osgi:service ref="destinationRegistry" interface="org.apache.servicemix.cxf.transport.http_osgi.OsgiDestinationRegistryIntf">
+    <osgi:service ref="destinationRegistry" interface="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistryIntf">
     </osgi:service>
 
 </beans>



Mime
View raw message