cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1153223 - in /cxf/branches/2.4.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/util/ parent/ rt/frontend/jaxws/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/
Date Tue, 02 Aug 2011 17:56:43 GMT
Author: dkulp
Date: Tue Aug  2 17:56:42 2011
New Revision: 1153223

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

........
  r1153221 | dkulp | 2011-08-02 13:52:49 -0400 (Tue, 02 Aug 2011) | 1 line
  
  Start working on getting things building and running with Java7
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
    cxf/branches/2.4.x-fixes/parent/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml
    cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java

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

Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java?rev=1153223&r1=1153222&r2=1153223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
(original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Compiler.java
Tue Aug  2 17:56:42 2011
@@ -73,6 +73,8 @@ public class Compiler {
         if (!StringUtils.isEmpty(target)) {
             list.add("-target");
             list.add(target);
+            list.add("-source");
+            list.add(target);
         }
 
         if (!StringUtils.isEmpty(outputDir)) {

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1153223&r1=1153222&r2=1153223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Aug  2 17:56:42 2011
@@ -1445,6 +1445,18 @@
             </properties>
         </profile>
         <profile>
+            <id>jdk17</id>
+            <activation>
+                <jdk>1.7</jdk>
+            </activation>
+            <properties>
+                <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
+                <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
+                <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
+                <jdk.version>1.6</jdk.version>
+            </properties>
+        </profile>
+        <profile>
             <id>validateServices</id>
             <properties>
                 <cxf.validateServices>true</cxf.validateServices>

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml?rev=1153223&r1=1153222&r2=1153223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/pom.xml Tue Aug  2 17:56:42 2011
@@ -295,6 +295,56 @@
             </dependencies>
         </profile>
         <profile>
+            <id>jdk17</id>
+            <activation>
+                <jdk>1.7</jdk>
+            </activation>
+            <properties>
+                <cxf.spi-dir>spi-2.2</cxf.spi-dir>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-transports-http</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-jaxws22-source</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${basedir}/src/main/jaxws22</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>add-jaxws22-test-source</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>${basedir}/src/test/jaxws22</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
             <id>jdk15</id>
             <activation>
                 <jdk>1.5</jdk>

Modified: cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java?rev=1153223&r1=1153222&r2=1153223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
(original)
+++ cxf/branches/2.4.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
Tue Aug  2 17:56:42 2011
@@ -41,6 +41,7 @@ public final class FaultBean {
     private static final String[] EXCLUDED_GETTER = new String[] {"getCause",
                                                                   "getLocalizedMessage",
                                                                   "getStackTrace",
+                                                                  "getSuppressed",
                                                                   "getClass"};
 
     public boolean faultBeanExists(final Class<?> exceptionClass) {



Mime
View raw message