cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1510702 - in /cxf/branches/2.7.x-fixes: api/pom.xml parent/pom.xml
Date Mon, 05 Aug 2013 20:13:39 GMT
Author: dkulp
Date: Mon Aug  5 20:13:39 2013
New Revision: 1510702

URL: http://svn.apache.org/r1510702
Log:
Merged revisions 1510653 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1510653 | dkulp | 2013-08-05 14:36:33 -0400 (Mon, 05 Aug 2013) | 2 lines

  Add a profile for the eclipse.moxy stuff for testing

........

Modified:
    cxf/branches/2.7.x-fixes/api/pom.xml
    cxf/branches/2.7.x-fixes/parent/pom.xml

Modified: cxf/branches/2.7.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/pom.xml?rev=1510702&r1=1510701&r2=1510702&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/api/pom.xml Mon Aug  5 20:13:39 2013
@@ -32,8 +32,7 @@
         <version>2.7.7-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
-    
-
+        
     <properties>
         <buildnumber.connection.url>${project.scm.developerConnection}</buildnumber.connection.url>
         <cxf.osgi.export>

Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1510702&r1=1510701&r2=1510702&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Mon Aug  5 20:13:39 2013
@@ -190,6 +190,7 @@
 
 
         <cxf.checkstyle.extension />
+        <cxf.jaxb.context.class/>
 
         <cxf.spring.validation.mode>VALIDATION_AUTO</cxf.spring.validation.mode>
 
@@ -405,6 +406,8 @@
                             <spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
                             <server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
                             <org.apache.cxf.transport.http.async.usePolicy>ALWAYS</org.apache.cxf.transport.http.async.usePolicy>
+                            <javax.xml.bind.JAXBContext>${cxf.jaxb.context.class}</javax.xml.bind.JAXBContext>
+                            <!--javax.xml.bind.JAXBContext>org.eclipse.persistence.jaxb.JAXBContextFactory</javax.xml.bind.JAXBContext-->
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
@@ -1621,7 +1624,32 @@
                 <checkstyle.skip>true</checkstyle.skip>
             </properties>
         </profile>
-
+        <profile>
+            <!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
+            <id>eclipse.moxy</id>
+            <properties>
+                <cxf.jaxb.context.class>org.eclipse.persistence.jaxb.JAXBContextFactory</cxf.jaxb.context.class>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.persistence</groupId>
+                    <artifactId>org.eclipse.persistence.moxy</artifactId>
+                    <version>2.5.1-SNAPSHOT</version>
+                    <scope>provided</scope>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+            <repositories>
+                <repository>
+                    <id>oss.sonatype.org</id>
+                    <name>OSS Sonatype Staging</name>
+                    <url>https://oss.sonatype.org/content/groups/staging</url>
+                    <releases><enabled>false</enabled></releases>
+                    <snapshots><enabled>true</enabled></snapshots>
+                </repository>
+            </repositories>            
+        </profile>
+        
         <profile>
             <id>nospringvalidation</id>
             <properties>



Mime
View raw message