cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1513147 - in /cxf/trunk: core/ core/src/main/java/org/apache/cxf/bus/ core/src/main/java/org/apache/cxf/catalog/ core/src/main/java/org/apache/cxf/configuration/blueprint/ core/src/main/java/org/apache/cxf/databinding/source/ core/src/main...
Date Mon, 12 Aug 2013 14:26:35 GMT
Author: dkulp
Date: Mon Aug 12 14:26:34 2013
New Revision: 1513147

URL: http://svn.apache.org/r1513147
Log:
Move all the code from rt/core to new core

Added:
    cxf/trunk/core/src/main/java/org/apache/cxf/bus/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/
    cxf/trunk/core/src/main/java/org/apache/cxf/catalog/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/
    cxf/trunk/core/src/main/java/org/apache/cxf/configuration/blueprint/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/
    cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/
    cxf/trunk/core/src/main/java/org/apache/cxf/databinding/stax/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/
    cxf/trunk/core/src/main/java/org/apache/cxf/feature/transform/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/transform/
    cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/security/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/
    cxf/trunk/core/src/main/java/org/apache/cxf/service/factory/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/
    cxf/trunk/core/src/main/java/org/apache/cxf/test/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/
    cxf/trunk/core/src/main/java/org/apache/cxf/transport/common/
      - copied from r1513141, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/common/
    cxf/trunk/core/src/main/resources/META-INF/cxf/
      - copied from r1513141, cxf/trunk/rt/core/src/main/resources/META-INF/cxf/
    cxf/trunk/core/src/main/resources/META-INF/services/
      - copied from r1513141, cxf/trunk/rt/core/src/main/resources/META-INF/services/
    cxf/trunk/core/src/main/resources/META-INF/spring.handlers
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers
    cxf/trunk/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
    cxf/trunk/core/src/main/resources/OSGI-INF/metatype/
      - copied from r1513141, cxf/trunk/rt/core/src/main/resources/OSGI-INF/metatype/
    cxf/trunk/core/src/main/resources/schemas/blueprint/
      - copied from r1513141, cxf/trunk/rt/core/src/main/resources/schemas/blueprint/
    cxf/trunk/core/src/main/resources/schemas/configuration/extension.xsd
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/main/resources/schemas/configuration/extension.xsd
    cxf/trunk/core/src/main/resources/schemas/core.xsd
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/main/resources/schemas/core.xsd
    cxf/trunk/core/src/test/java/org/apache/cxf/bus/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/
    cxf/trunk/core/src/test/java/org/apache/cxf/buslifecycle/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/README.txt
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/README.txt
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/foo/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/foo/
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
    cxf/trunk/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
      - copied unchanged from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
    cxf/trunk/core/src/test/java/org/apache/cxf/databinding/source/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/
    cxf/trunk/core/src/test/java/org/apache/cxf/endpoint/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/
    cxf/trunk/core/src/test/java/org/apache/cxf/feature/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/feature/
    cxf/trunk/core/src/test/java/org/apache/cxf/interceptor/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/
    cxf/trunk/core/src/test/java/org/apache/cxf/transport/common/
      - copied from r1513141, cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/common/
Removed:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/blueprint/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/feature/transform/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/common/
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/
    cxf/trunk/rt/core/src/main/resources/META-INF/services/
    cxf/trunk/rt/core/src/main/resources/META-INF/spring.handlers
    cxf/trunk/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
    cxf/trunk/rt/core/src/main/resources/OSGI-INF/metatype/
    cxf/trunk/rt/core/src/main/resources/schemas/blueprint/
    cxf/trunk/rt/core/src/main/resources/schemas/configuration/extension.xsd
    cxf/trunk/rt/core/src/main/resources/schemas/core.xsd
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/README.txt
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/foo/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/databinding/source/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/feature/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/common/
Modified:
    cxf/trunk/core/pom.xml
    cxf/trunk/core/src/main/resources/META-INF/spring.schemas

Modified: cxf/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1513147&r1=1513146&r2=1513147&view=diff
==============================================================================
--- cxf/trunk/core/pom.xml (original)
+++ cxf/trunk/core/pom.xml Mon Aug 12 14:26:34 2013
@@ -35,9 +35,11 @@
         
     <properties>
         <buildnumber.connection.url>${project.scm.developerConnection}</buildnumber.connection.url>
+        <cxf.bundle.activator>org.apache.cxf.bus.osgi.CXFActivator</cxf.bundle.activator>
         <cxf.osgi.export>
             !org.apache.cxf.internal,
-            org.apache.cxf.*,
+            META-INF.cxf,
+            org.apache.cxf.*
         </cxf.osgi.export>
         <cxf.osgi.import>
             com.ctc.wstx.stax*;resolution:=optional,
@@ -59,7 +61,7 @@
             org.apache.aries*;version="${cxf.aries.version.range}"
         </cxf.osgi.import>
         <cxf.osgi.dynamic.import>
-            org.apache.cxf.bus,org.apache.cxf.*
+            org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.*
         </cxf.osgi.dynamic.import>
     </properties>
 
@@ -81,6 +83,12 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <scope>provided</scope>
@@ -160,6 +168,12 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: cxf/trunk/core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/resources/META-INF/spring.schemas?rev=1513147&r1=1513146&r2=1513147&view=diff
==============================================================================
--- cxf/trunk/core/src/main/resources/META-INF/spring.schemas (original)
+++ cxf/trunk/core/src/main/resources/META-INF/spring.schemas Mon Aug 12 14:26:34 2013
@@ -29,3 +29,4 @@ http\://schemas.xmlsoap.org/ws/2004/08/a
 http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
 http\://cxf.apache.org/schemas/configuration/parameterized-types.xsd=schemas/configuration/parameterized-types.xsd
 
+http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd



Mime
View raw message