cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764055 - in /cxf/branches/2.1.x-fixes: ./ common/common/ integration/jbi/src/main/java/org/apache/cxf/jbi/se/ parent/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ systests/src/test/java/org/apache/cxf/systest/jaxws/ systests/...
Date Fri, 10 Apr 2009 21:06:18 GMT
Author: dkulp
Date: Fri Apr 10 21:06:17 2009
New Revision: 764055

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

........
  r764033 | dkulp | 2009-04-10 16:16:25 -0400 (Fri, 10 Apr 2009) | 2 lines
  
  Progress furthur toward getting things working on IBM jdk.  Tests now "pass", build itself
fails, but passes when re-run.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/pom.xml
    cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
    cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/filters.properties
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
    cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
    cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 21:06:17 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033

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

Modified: cxf/branches/2.1.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/pom.xml?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/common/common/pom.xml Fri Apr 10 21:06:17 2009
@@ -175,7 +175,6 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
-                    <version>1.4.2</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

Modified: cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
(original)
+++ cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
Fri Apr 10 21:06:17 2009
@@ -44,6 +44,7 @@
 import org.apache.cxf.BusException;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.EndpointUtils;
 import org.apache.cxf.jbi.ServiceConsumer;
@@ -253,10 +254,7 @@
         File metaInf = new File(rootPath, "META-INF");
         File jbiXml = new File(metaInf, "jbi.xml");
         try { 
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(jbiXml.toURI().toURL().toString());
+            Document doc = XMLUtils.parse(jbiXml);
             
             Element providesEl = (Element)findNode(doc.getDocumentElement(), "provides");
             Element consumersEl = (Element)findNode(doc.getDocumentElement(), "consumes");

Modified: cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/filters.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/filters.properties?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/filters.properties
(original)
+++ cxf/branches/2.1.x-fixes/integration/jbi/src/main/java/org/apache/cxf/jbi/se/filters.properties
Fri Apr 10 21:06:17 2009
@@ -26,3 +26,4 @@
 org.apache.*
 sun.*
 test.*
+META-INF.*

Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Apr 10 21:06:17 2009
@@ -37,13 +37,15 @@
         <surefire.format>brief</surefire.format>
         <surefire.usefile>false</surefire.usefile>
 	<surefire.fork.vmargs>-ea</surefire.fork.vmargs>
+        <surefire.extra.sysprop.name1>None</surefire.extra.sysprop.name1>
+        <surefire.extra.sysprop.value1>None</surefire.extra.sysprop.value1>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
         <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
         <saaj.impl.groupId>com.sun.xml.messaging.saaj</saaj.impl.groupId>
         <saaj.impl.artifactId>saaj-impl</saaj.impl.artifactId>
         <saaj.impl.version>1.3.2</saaj.impl.version>
 
-	<!-- please maintain alphabetical order here -->
+        <!-- please maintain alphabetical order here -->
         <abdera.version>0.4.0-incubating</abdera.version>
         <activemq.version>4.1.1</activemq.version>
         <derby.version>10.2.2.0</derby.version>
@@ -191,7 +193,7 @@
                         </dependency>
                     </dependencies>
                     <configuration>
-                      <encoding>UTF-8</encoding>
+                        <encoding>UTF-8</encoding>
                     </configuration>
                     <executions>
                         <execution>
@@ -268,6 +270,14 @@
                         <argLine>${surefire.fork.vmargs}</argLine>
                         <systemProperties>
                             <property>
+                                <name>${surefire.extra.sysprop.name1}</name>
+                                <name>${surefire.extra.sysprop.value1}</name>
+                            </property>
+                            <property>
+                                <name>cxf.validateServiceSchemas</name>
+                                <value>${cxf.validateServices}</value>
+                            </property>
+                            <property>
                                 <name>java.awt.headless</name>
                                 <value>${java.awt.headless}</value>
                             </property>
@@ -292,6 +302,10 @@
                                 <value>${surefire.fork.vmargs}</value>
                             </property>
                             <property>
+                                <name>java.security.properties</name>
+                                <value>${basedir}/target/test-classes/ibm.security</value>
+                            </property>
+                            <property>
                                 <!-- If we close the port after a client in the same JVM
has opened a keep-alive
                                 connection, on some Linux's, the socket remains consumed
until
                                 some timeout occurs.   That may cause some tests to timeout/hang.
-->
@@ -304,24 +318,26 @@
             </plugins>
         </pluginManagement>
         <plugins>
-             <plugin>
-                  <groupId>org.apache.cxf</groupId>
-                  <artifactId>cxf-xml2fastinfoset-plugin</artifactId>
-                  <version>${project.version}</version>
-                  <configuration>
-                    <includes><include>META-INF/cxf/cxf*.xml</include></includes>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-xml2fastinfoset-plugin</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <includes>
+                        <include>META-INF/cxf/cxf*.xml</include>
+                    </includes>
                     <outputDirectory>target/generated/src/main/resources</outputDirectory>
-                  </configuration>
-                  <executions>
-                   <execution>
-                     <id>xml2fastinfoset</id>
-                     <phase>generate-sources</phase>
-                    <goals>
-                     <goal>xml2fastinfoset</goal>
-                    </goals>
-                   </execution>
-                 </executions>
-          	</plugin>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>xml2fastinfoset</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>xml2fastinfoset</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <version>1.0</version>
@@ -358,7 +374,25 @@
 
     <dependencyManagement>
         <dependencies>
+<<<<<<< .working
+=======
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
+            </dependency>
+>>>>>>> .merge-right.r764033
+            <dependency>
+<<<<<<< .working
+=======
+                <groupId>com.sun.xml.fastinfoset</groupId>
+                <artifactId>FastInfoset</artifactId>
+                <version>1.2.3</version>
+            </dependency>
+
+
             <dependency>
+>>>>>>> .merge-right.r764033
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.4</version>
@@ -444,6 +478,12 @@
                 <groupId>com.sun.xml.parsers</groupId>
                 <artifactId>jaxp-ri</artifactId>
                 <version>1.4.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.parsers</groupId>
+                        <artifactId>jaxp-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
@@ -459,10 +499,10 @@
                         <groupId>mx4j</groupId>
                         <artifactId>mx4j</artifactId>
                     </exclusion>
-		    <exclusion>
-		      <groupId>org.codehaus.woodstox</groupId>
-		      <artifactId>wstx-asl</artifactId>
-		    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -495,11 +535,12 @@
                         <groupId>woodstox</groupId>
                         <artifactId>wstx-asl</artifactId>
                     </exclusion>
-                   <exclusion>
+                    <exclusion>
                         <groupId>org.codehaus.woodstox</groupId>
                         <artifactId>wstx-asl</artifactId>
                     </exclusion>
  
+
                 </exclusions>
             </dependency>
             <dependency>
@@ -559,11 +600,11 @@
                         <groupId>stax</groupId>
                         <artifactId>stax-api</artifactId>
                     </exclusion>
-<!-- this one comes from sjsxp -->
-		    <exclusion>
-		      <groupId>javax.xml.stream</groupId>
-		      <artifactId>stax-api</artifactId>
-		    </exclusion>
+                    <!-- this one comes from sjsxp -->
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -582,9 +623,31 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.ws.commons.schema</groupId>
                 <artifactId>XmlSchema</artifactId>
                 <version>${xmlschema.version}</version>
+                <exclusions>
+                    <!-- on IBM jdk, XmlSchema pulls these in -->
+                    <exclusion>
+                        <groupId>org.apache.bcel</groupId>
+                        <artifactId>bcel</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xalan</groupId>
+                        <artifactId>xalan</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>javax.xml.soap</groupId>
@@ -904,7 +967,7 @@
                         <groupId>stax</groupId>
                         <artifactId>stax-api</artifactId>
                     </exclusion>
-                </exclusions>                
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>xml-resolver</groupId>
@@ -961,10 +1024,37 @@
                         <groupId>stax</groupId>
                         <artifactId>stax-api</artifactId>
                     </exclusion>
+<<<<<<< .working
 		    <exclusion>
 		      <groupId>org.codehaus.woodstox</groupId>
 		      <artifactId>wstx-asl</artifactId>
 		    </exclusion>
+=======
+                    <exclusion>
+                        <artifactId>xmlParserAPIs</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xercesImpl</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xom</artifactId>
+                        <groupId>xom</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xalan</artifactId>
+                        <groupId>xalan</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xml-apis</artifactId>
+                        <groupId>xml-apis</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
+>>>>>>> .merge-right.r764033
                 </exclusions>
             </dependency>
             <dependency>
@@ -984,10 +1074,37 @@
                         <groupId>stax</groupId>
                         <artifactId>stax-api</artifactId>
                     </exclusion>
+<<<<<<< .working
 		    <exclusion>
 		      <groupId>org.codehaus.woodstox</groupId>
 		      <artifactId>wstx-asl</artifactId>
 		    </exclusion>
+=======
+                    <exclusion>
+                        <artifactId>xmlParserAPIs</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xercesImpl</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xom</artifactId>
+                        <groupId>xom</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xalan</artifactId>
+                        <groupId>xalan</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xml-apis</artifactId>
+                        <groupId>xml-apis</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
+>>>>>>> .merge-right.r764033
                 </exclusions>
             </dependency>
             <dependency>
@@ -1009,6 +1126,63 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+<<<<<<< .working
+=======
+
+            <dependency>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.1</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>dom4j</artifactId>
+                        <groupId>dom4j</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xmlParserAPIs</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xercesImpl</artifactId>
+                        <groupId>xerces</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xom</artifactId>
+                        <groupId>xom</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xalan</artifactId>
+                        <groupId>xalan</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xml-apis</artifactId>
+                        <groupId>xml-apis</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.9.1</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>xml-apis</artifactId>
+                        <groupId>xml-apis</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <!-- if we use the new woodstox artifact, we're using the new version -->
+            <dependency>
+                <groupId>org.codehaus.woodstox</groupId>
+                <artifactId>woodstox-core-asl</artifactId>
+                <version>4.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.msv</groupId>
+                <artifactId>msv-core</artifactId>
+                <version>${msv.version}</version>
+            </dependency>
+>>>>>>> .merge-right.r764033
         </dependencies>
     </dependencyManagement>
 
@@ -1031,6 +1205,12 @@
 
     <profiles>
         <profile>
+            <id>validateServices</id>
+            <properties>
+                <cxf.validateServices>true</cxf.validateServices>
+            </properties>
+        </profile>
+        <profile>
             <!-- sjsxp is really the precursor to the jaxp-ri jars.   However, getting
the jaxp-ri  jar to work on 
             Java 5 requires endorsing it which is non-trivial in maven  :-(.
             -->
@@ -1050,7 +1230,7 @@
                 <stax.impl.artifactId>jaxp-ri</stax.impl.artifactId>
                 <stax.impl.version>1.4.2</stax.impl.version>
             </properties>
-	        </profile>
+        </profile>
         <profile>
             <id>woodstox4</id>
             <properties>
@@ -1081,7 +1261,7 @@
         <profile>
             <id>nospringvalidation</id>
             <properties>
-              <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
+                <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
             </properties>
         </profile>
 
@@ -1129,11 +1309,11 @@
         </profile>
 
         <profile>
-	  <!-- pmd and checkstyle, no tests. -->
+            <!-- pmd and checkstyle, no tests. -->
             <id>justsourcecheck</id>
-	    <properties>
-	      <maven.test.skip.exec>true</maven.test.skip.exec>
-	    </properties>
+            <properties>
+                <maven.test.skip.exec>true</maven.test.skip.exec>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -1186,6 +1366,28 @@
                     <value>IBM Corporation</value>
                 </property>
             </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <!--
+                The default xalan TransformerFactory on the
+                ibm jdk seems to be 
+                org.apache.xalan.processor.TransformerFactoryImpl
+                which seems to have an issue causing it to
+                add things like duplicate default namespace
+                declarations.  woodstox doesn't like that.
+                So set this property to use the xsltc
+                TransformerFactory which behaves better with
+                woodstox (and which the sun jdk seems to
+                default to).
+                -->
+                <surefire.extra.sysprop.name1>javax.xml.transform.TransformerFactory</surefire.extra.sysprop.name1>
+                <surefire.extra.sysprop.value1>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</surefire.extra.sysprop.value1>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -1199,12 +1401,15 @@
                             <showDeprecation>true</showDeprecation>
                             <showWarnings>true</showWarnings>
                             <compilerArgument>${compile.flags}</compilerArgument>
+                            <fork>true</fork>
+                            <maxmem>512M</maxmem>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
                     </plugin>
+<<<<<<< .working
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -1262,6 +1467,8 @@
                             </systemProperties>
                         </configuration>
                     </plugin>
+=======
+>>>>>>> .merge-right.r764033
                 </plugins>
             </build>
         </profile>

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
Fri Apr 10 21:06:17 2009
@@ -295,12 +295,7 @@
 
     @Test
     public void testSchemeHostPortQueryFragment() throws Exception {
-        URI uri;
-        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
-            uri = new URI("http://foo:1234/bar?n2=v2&n1=v1#fragment");
-        } else {
-            uri = new URI("http://foo:1234/bar?n1=v1&n2=v2#fragment");
-        }
+        URI uri = new URI("http://foo:1234/bar?n1=v1&n2=v2#fragment");
         URI newUri = new UriBuilderImpl().scheme("http").host("foo").port(1234).path("bar").queryParam("n1",
                                                                                         
              "v1")
             .queryParam("n2", "v2").fragment("fragment").build();

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
Fri Apr 10 21:06:17 2009
@@ -243,6 +243,9 @@
         String response = new String("Bonjour");
          
         try {
+            ((BindingProvider)greeter).getRequestContext()
+                .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+                     "http://localhost:9000/SoapContext/SoapPort");
             greeter.greetMe("test");
             String reply = greeter.sayHi();
             assertNotNull("no response received from service", reply);
@@ -314,6 +317,9 @@
         
         //getPort only passing in SEI
         Greeter greeter = service.getPort(Greeter.class);
+        ((BindingProvider)greeter).getRequestContext()
+            .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+                 "http://localhost:9000/SoapContext/SoapPort");
         
         String response1 = new String("Hello Milestone-");
         String response2 = new String("Bonjour");

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
Fri Apr 10 21:06:17 2009
@@ -162,6 +162,34 @@
         };
         NOT_WORKING_TESTS.addAll(Arrays.asList(notWorking));
 
+        String notWorkingIBM[] = new String[] {
+            "AnyURIEnum",
+            "NMTokenEnum",
+            "DecimalEnum",
+            "StringEnum",
+            "NumberEnum",
+            "ColourEnum",
+            "Base64Binary",
+            "HexBinary",
+            "Decimal",
+            "UnsignedShort",
+            "SimpleChoice",
+            "EmptyChoice",
+            "NestedArray",
+            "CompoundArray",
+            "UnboundedArray",
+            "BoundedArray",
+            "FixedArray",
+            "AnonymousStruct",
+            "StructWithNillables",
+            "ChoiceWithBinary",
+            "StructWithBinary",
+            "MultipleOccursSequenceInSequence",
+            "DerivedEmptyBaseEmptyChoice"
+        };
+        if (System.getProperty("java.vendor").contains("IBM")) {
+            NOT_WORKING_TESTS.addAll(Arrays.asList(notWorkingIBM));
+        }
     }
     
 
@@ -175,16 +203,19 @@
     public static void deleteRefFile() throws Exception {
         File file = new File("./TypeTest.ref");
         file.delete();
-        //for (String s : RUN_TESTS) {
-        //    System.out.println(s);
-        //}
+        for (String s : RUN_TESTS) {
+            System.out.println(s);
+        }
+        System.out.println(RUN_TESTS.size());
     }
 
     public boolean shouldRunTest(String name) {
         if (!NOT_WORKING_TESTS.contains(name)) {
-            RUN_TESTS.add(name);
-            return true;
-            //return true;
+            boolean b = super.shouldRunTest(name);
+            if (b) {
+                RUN_TESTS.add(name);
+            }
+            return b;
         }
         return false;
     }

Modified: cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/Stax2DOM.java
Fri Apr 10 21:06:17 2009
@@ -48,6 +48,7 @@
 import org.apache.cxf.tools.util.URIParserUtil;
 
 public class Stax2DOM {
+    static final String XML_NS = "http://www.w3.org/2000/xmlns/";
 
     private  Element currentElement;
     private  Document doc;
@@ -140,28 +141,38 @@
 
     public void startElement(StartElement ele) {
         Element element = null;
-        element = doc.createElementNS(ele.getName().getNamespaceURI(), ele.getName().getLocalPart());
-
-        Iterator ite = ele.getAttributes();
-
-        while (ite.hasNext()) {
-            Attribute attr = (Attribute)ite.next();
-            element.setAttribute(attr.getName().getLocalPart(), attr.getValue());
+        if (!StringUtils.isEmpty(ele.getName().getPrefix())) {
+            element = doc.createElementNS(ele.getName().getNamespaceURI(),
+                                          ele.getName().getPrefix() + ":"
+                                          + ele.getName().getLocalPart());
+        } else {
+            element = doc.createElementNS(ele.getName().getNamespaceURI(), 
+                                          ele.getName().getLocalPart());
         }
 
-        String xmlns = "http://schemas.xmlsoap.org/wsdl/";
-        ite = ele.getNamespaces();
+        Iterator ite = ele.getNamespaces();
         while (ite.hasNext()) {
             Namespace ns = (Namespace) ite.next();
-            String name = ns.getPrefix();
-            if (!StringUtils.isEmpty(name)) {
-                Attr attr = element.getOwnerDocument().createAttributeNS(xmlns, name);
-                attr.setValue(ns.getNamespaceURI());
+            String pfx = ns.getPrefix();
+            String uri = ns.getNamespaceURI();
+            if (!StringUtils.isEmpty(pfx)) {
+                Attr attr = element.getOwnerDocument().createAttributeNS(XML_NS,
+                                                                        "xmlns:" + pfx);
+                attr.setValue(uri);
                 element.setAttributeNodeNS(attr);
             } else {
-                xmlns = ns.getNamespaceURI();
+                Attr attr = element.getOwnerDocument().createAttributeNS(XML_NS,
+                                                                         "xmlns");
+                attr.setValue(uri);
+                element.setAttributeNodeNS(attr);
             }
         }
+        ite = ele.getAttributes();
+        while (ite.hasNext()) {
+            Attribute attr = (Attribute)ite.next();
+            element.setAttribute(attr.getName().getLocalPart(), attr.getValue());
+        }
+
 
         if (currentElement == null) {
             doc.appendChild(element);

Modified: cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java?rev=764055&r1=764054&r2=764055&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
Fri Apr 10 21:06:17 2009
@@ -34,7 +34,8 @@
         File wsdl = new File(getClass().getResource("/validator_wsdl/jms_test.wsdl").toURI());
         Document doc = new Stax2DOM().getDocument(wsdl);
         String content = XMLUtils.toString(doc);
-        assertTrue(content.indexOf("xmlns:ns0=\"http://www.w3.org/2001/XMLSchema\"") != -1);
-        assertTrue(content.indexOf("ns0:x1=\"http://cxf.apache.org/hello_world_jms/types\"")
!= -1);
+        assertTrue(content, content.indexOf("xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"")
!= -1);
+        assertTrue(content, content.indexOf("xmlns:x1=\"http://cxf.apache.org/hello_world_jms/types\"")
+                                           != -1);
     }
 }



Mime
View raw message