cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r702580 - in /cxf/trunk: common/common/ common/xjc/dv-test/ common/xjc/ts-test/ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ parent/ rt/bindings/soap/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/j...
Date Tue, 07 Oct 2008 18:45:13 GMT
Author: dkulp
Date: Tue Oct  7 11:45:12 2008
New Revision: 702580

URL: http://svn.apache.org/viewvc?rev=702580&view=rev
Log:
Progressing toward getting things building/testing with the IBM 1.5 JDK on Linux and AIX

Modified:
    cxf/trunk/common/common/pom.xml
    cxf/trunk/common/xjc/dv-test/pom.xml
    cxf/trunk/common/xjc/ts-test/pom.xml
    cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/bindings/soap/pom.xml
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/transports/jms/pom.xml
    cxf/trunk/rt/ws/security/pom.xml
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java

Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Tue Oct  7 11:45:12 2008
@@ -101,12 +101,12 @@
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -121,7 +121,7 @@
             <scope>provided</scope>
         </dependency>
 
-        
+
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
@@ -147,8 +147,8 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
             <scope>test</scope>
-       </dependency>
-        
+        </dependency>
+
     </dependencies>
 
     <scm>
@@ -156,4 +156,24 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/common/common</developerConnection>
     </scm>
 
+    <profiles>
+        <profile>
+            <id>ibmjdk</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>IBM Corporation</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.parsers</groupId>
+                    <artifactId>jaxp-ri</artifactId>
+                    <version>1.4.2</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

Modified: cxf/trunk/common/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/dv-test/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/common/xjc/dv-test/pom.xml (original)
+++ cxf/trunk/common/xjc/dv-test/pom.xml Tue Oct  7 11:45:12 2008
@@ -82,22 +82,36 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.sun.tools.xjc.maven2</groupId>
-                <artifactId>maven-jaxb-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
-                        <configuration>
-                            <generateDirectory>${basedir}/target/generated/src/test/java</generateDirectory>
-                            <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
-                            <includeSchema>*.xsd</includeSchema>
-                            <extension>true</extension>
-                            <args>-Xdv</args>
-                        </configuration>
                         <goals>
-                            <goal>generate</goal>
+                            <goal>xjc</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory>
+                    <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
+                    <arguments>-Xdv</arguments>
+                    <extension>true</extension>
+                    <quiet>true</quiet>
+                </configuration>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-xjc-dv</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-xjc-ts</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/common/xjc/ts-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xjc/ts-test/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/common/xjc/ts-test/pom.xml (original)
+++ cxf/trunk/common/xjc/ts-test/pom.xml Tue Oct  7 11:45:12 2008
@@ -80,22 +80,36 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.sun.tools.xjc.maven2</groupId>
-                <artifactId>maven-jaxb-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
-                        <configuration>
-                            <generateDirectory>${basedir}/target/generated/src/test/java</generateDirectory>
-                            <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
-                            <includeSchema>*.xsd</includeSchema>
-                            <extension>true</extension>
-                            <args>-Xts</args>
-                        </configuration>
                         <goals>
-                            <goal>generate</goal>
+                            <goal>xjc</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <outputDirectory>${basedir}/target/generated/src/test/java</outputDirectory>
+                    <schemaDirectory>${basedir}/src/test/resources/schemas/configuration</schemaDirectory>
+                    <arguments>-Xts</arguments>
+                    <extension>true</extension>
+                    <quiet>true</quiet>
+                </configuration>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-xjc-dv</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-xjc-ts</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
(original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
Tue Oct  7 11:45:12 2008
@@ -30,7 +30,8 @@
      * this horrid inital value to tell if it has been 
      * configured or not yet.
      */
-    private static final String DEFAULT_WSDL_LOCATION = "@£$%^&*()DEFAULTWSDLLOCATION";
+    private static final String DEFAULT_WSDL_LOCATION = "DEFAULTWSDLLOCATION - WORKAROUND";
+
     protected List<String> packagenames;
     protected List<String> extraargs = new ArrayList<String>();
     protected File outputDir;

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Oct  7 11:45:12 2008
@@ -155,23 +155,6 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>com.sun.tools.xjc.maven2</groupId>
-                    <artifactId>maven-jaxb-plugin</artifactId>
-                    <version>1.1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.cxf</groupId>
-                            <artifactId>cxf-xjc-dv</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.cxf</groupId>
-                            <artifactId>cxf-xjc-ts</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.2</version>
@@ -453,7 +436,11 @@
                 <artifactId>ant-nodeps</artifactId>
                 <version>1.6.5</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.sun.xml.parsers</groupId>
+                <artifactId>jaxp-ri</artifactId>
+                <version>1.4.2</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jbi</artifactId>

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Tue Oct  7 11:45:12 2008
@@ -95,4 +95,22 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/bindings/soap</developerConnection>
     </scm>
 
+    <profiles>
+        <profile>
+            <id>ibmjdk</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>IBM Corporation</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.parsers</groupId>
+                    <artifactId>jaxp-ri</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
Tue Oct  7 11:45:12 2008
@@ -270,7 +270,7 @@
         return false;
     }
 
-    private static Object getAnnotationValue(String name,
+    static Object getAnnotationValue(String name,
             AnnotatedElement element,
             Object ignoredValue,
             Class<? extends Annotation>... annotations) {

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Tue Oct  7 11:45:12 2008
@@ -152,4 +152,22 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxws</developerConnection>
     </scm>
 
+    <profiles>
+        <profile>
+            <id>ibmjdk</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>IBM Corporation</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.parsers</groupId>
+                    <artifactId>jaxp-ri</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Tue Oct  7 11:45:12 2008
@@ -72,12 +72,6 @@
         </dependency>
 
         <dependency>
-            <groupId>${saaj.impl.groupId}</groupId>
-            <artifactId>${saaj.impl.artifactId}</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
             <scope>test</scope>

Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Tue Oct  7 11:45:12 2008
@@ -159,4 +159,24 @@
         <connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/rt/ws/security</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/rt/ws/security</developerConnection>
     </scm>
+
+    <profiles>
+        <profile>
+            <id>ibmjdk</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>IBM Corporation</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.parsers</groupId>
+                    <artifactId>jaxp-ri</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
(original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
Tue Oct  7 11:45:12 2008
@@ -392,13 +392,13 @@
         vResults.addWarning(warningMsg);
     }
 
-    @SuppressWarnings("unchecked")
     private void collectValidationPoints() throws Exception {
         if (services.size() == 0) {
             LOG.log(Level.WARNING, "WSDL document " 
                     + this.definition.getDocumentBaseURI() + " does not define any services");
             //addWarning("WSDL document does not define any services");
-            portTypeRefNames.addAll(this.definition.getAllPortTypes().keySet());
+            Collection<QName> ports = CastUtils.cast(this.definition.getAllPortTypes().keySet());
+            portTypeRefNames.addAll(ports);
         } else {
             collectValidationPointsForBindings();
         }

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=702580&r1=702579&r2=702580&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
(original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
Tue Oct  7 11:45:12 2008
@@ -38,6 +38,7 @@
 
 import org.apache.cxf.common.util.CollectionUtils;
 import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.common.extensions.soap.SoapBody;
@@ -358,7 +359,6 @@
     }
 
     // TODO: Should also check SoapHeader/SoapHeaderFault
-    @SuppressWarnings("unchecked")
     public boolean checkR2205() {
         for (Iterator ite = def.getBindings().values().iterator(); ite.hasNext();) {
             Binding binding = (Binding)ite.next();
@@ -371,14 +371,14 @@
 
             for (Iterator ite2 = binding.getPortType().getOperations().iterator(); ite2.hasNext();)
{
                 Operation operation = (Operation)ite2.next();
-                Collection<Fault> faults = operation.getFaults().values();
+                Collection<Fault> faults = CastUtils.cast(operation.getFaults().values());
                 if (CollectionUtils.isEmpty(faults)) {
                     continue;
                 }
 
                 for (Fault fault : faults) {
                     Message message = fault.getMessage();
-                    Collection<Part> parts = message.getParts().values();
+                    Collection<Part> parts = CastUtils.cast(message.getParts().values());
                     for (Part part : parts) {
                         if (part.getElementName() == null) {
                             addErrorMessage(getErrorPrefix("WSI-BP-1.0 R2205") + "In Message
" 



Mime
View raw message