You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/09/29 17:50:42 UTC

svn commit: r819996 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http-osgi/ rt/transports/http-osgi/src/ rt/transports/http-osgi/src/main/ rt/transports/http-osgi/src/main/java/ rt/transports/http-osgi/src/main/java/org/ rt/transports/http-osgi/src...

Author: dkulp
Date: Tue Sep 29 15:50:41 2009
New Revision: 819996

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

........
  r819955 | dkulp | 2009-09-29 10:08:06 -0400 (Tue, 29 Sep 2009) | 2 lines
  
  Copy http-osgi transport from smx to start preparing it to be part of CXF
........

Added:
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/   (props changed)
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/pom.xml
      - copied unchanged from r819955, cxf/trunk/rt/transports/http-osgi/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestination.java
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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/main/resources/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
      - copied unchanged from r819955, cxf/trunk/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/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
      - copied unchanged from r819955, cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/
      - copied from r819955, cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/
    cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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
      - copied unchanged from r819955, cxf/trunk/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)

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

Propchange: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 29 15:50:41 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+