Author: dkulp
Date: Tue Mar 27 10:25:28 2007
New Revision: 523006
URL: http://svn.apache.org/viewvc?view=rev&rev=523006
Log:
Fix some jaxws codegen issues
* Support for jaxb:schemaBindings not in jaxws customization file
* Support for the package names on the interface (and handlers files)
* Fix setting MIME type on OUT and INOUT params.
* Add some messages when AWQT fails
* Update some deps (a LOT more work is needed) for aegis and ws/security
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
incubator/cxf/trunk/rt/databinding/aegis/pom.xml
incubator/cxf/trunk/rt/ws/security/pom.xml
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/MIMEProcessor.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
(original)
+++
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
Tue Mar 27 10:25:28 2007
@@ -214,7 +214,7 @@
DeadLockThread dead = new DeadLockThread(workqueue, 200,
10L);
- assertTrue(checkDeadLock(dead));
+ checkDeadLock(dead);
}
public void testNonDeadLockEnqueueLoads() {
@@ -225,7 +225,7 @@
DEFAULT_DEQUEUE_TIMEOUT);
DeadLockThread dead = new DeadLockThread(workqueue, 200);
- assertTrue(checkDeadLock(dead));
+ checkDeadLock(dead);
}
public void testSchedule() throws Exception {
@@ -265,7 +265,7 @@
DeadLockThread dead = new DeadLockThread(workqueue, 1000, 5L);
- assertTrue("Should be finished, probably deadlocked",
checkDeadLock(dead));
+ checkDeadLock(dead);
// Give threads a chance to dequeue (5sec max)
int i = 0;
@@ -293,7 +293,7 @@
DEFAULT_LOW_WATER_MARK, 100L);
DeadLockThread dead = new DeadLockThread(workqueue, 1000, 5L);
- assertTrue("Should be finished, probably deadlocked",
checkDeadLock(dead));
+ checkDeadLock(dead);
// Give threads a chance to dequeue (5sec max)
int i = 0;
@@ -319,7 +319,7 @@
assertEquals(0, workqueue.getSize());
DeadLockThread dead = new DeadLockThread(workqueue, 100, 5L);
dead.start();
- assertTrue(checkCompleted(dead));
+ checkCompleted(dead);
workqueue.shutdown(true);
@@ -338,7 +338,7 @@
workqueue = null;
}
- private boolean checkCompleted(DeadLockThread dead) {
+ private void checkCompleted(DeadLockThread dead) {
int oldCompleted = 0;
int newCompleted = 0;
int noProgressCount = 0;
@@ -354,7 +354,10 @@
//
if (oldCompleted != 0
&& ++noProgressCount > 5) {
- return false;
+
+ fail("No reduction in threads in 1.25 secs: \n"
+ + "oldCompleted: " + oldCompleted
+ + "\nof " + dead.getWorkItemCount());
}
}
try {
@@ -363,12 +366,11 @@
// ignore
}
}
- return true;
}
- private boolean checkDeadLock(DeadLockThread dead) {
+ private void checkDeadLock(DeadLockThread dead) {
dead.start();
- return checkCompleted(dead);
+ checkCompleted(dead);
}
public class TestWorkItem implements Runnable {
Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Tue Mar 27 10:25:28 2007
@@ -19,138 +19,137 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-databinding-aegis</artifactId>
- <packaging>jar</packaging>
- <name>Apache CXF Runtime Aegis Databinding</name>
- <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
-
-
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xmlParserAPIs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xercesImpl</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xom</artifactId>
- <groupId>xom</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>test</scope>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <version>snapshot-20040917</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>codehaus</id>
- <name>Codehaus</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
- <failsOnError>false</failsOnError>
- <consoleOutput>false</consoleOutput>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache CXF Runtime Aegis Databinding</name>
+ <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
+
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.bea.xml</groupId>
+ <artifactId>jsr173-ri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xmlParserAPIs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xercesImpl</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xom</artifactId>
+ <groupId>xom</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>codehaus</id>
+ <name>Codehaus</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <failsOnError>false</failsOnError>
+ <consoleOutput>false</consoleOutput>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Tue Mar 27 10:25:28 2007
@@ -1,197 +1,202 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-rt-ws-security</artifactId>
- <packaging>jar</packaging>
- <name>Apache CXF Runtime WS Security</name>
- <url>http://cwiki.apache.org/CXF</url>
-
- <parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-parent</artifactId>
- <version>2.0-incubator-RC-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
- </parent>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
- <!-- We should get these properly uploaded -->
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>opensaml</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.xfire</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>133</version>
- </dependency>
- </dependencies>
-
- <scm>
- <connection>
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/ws/security
- </connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/ws/security
- </developerConnection>
- </scm>
- <build>
- <plugins>
- <!-- <plugin>-->
- <!--
<groupId>org.apache.cxf</groupId>-->
- <!--
<artifactId>cxf-common-xsd</artifactId>-->
- <!--
<version>${project.version}</version>-->
- <!-- <executions>-->
- <!-- <execution>-->
- <!--
<id>generate-sources</id>-->
- <!--
<phase>generate-sources</phase>-->
- <!--
<configuration>-->
- <!--
<sourceRoot>-->
- <!--
${basedir}/target/generated/src/main/java-->
- <!--
</sourceRoot>-->
- <!--
<xsdOptions>-->
- <!--
<xsdOption>-->
- <!--
<xsd>-->
- <!--
${basedir}/src/main/resources/schemas/ws-security-policy.xsd-->
- <!--
</xsd>-->
- <!--
<bindingFile>-->
- <!--
${basedir}/src/main/resources/schemas/ws-security-policy.xjb-->
- <!--
</bindingFile>-->
- <!--
<catalog>-->
- <!--
${basedir}/src/main/resources/schemas/catalog.cat-->
- <!--
</catalog>-->
- <!--
<deleteDirs>-->
- <!--
<deleteDir>-->
- <!--
${basedir}/target/generated/src/main/java/org/apache/cxf/ws/security/policy-->
- <!--
</deleteDir>-->
- <!--
</deleteDirs>-->
- <!--
</xsdOption>-->
- <!--
</xsdOptions>-->
- <!--
</configuration>-->
- <!--
<goals>-->
- <!--
<goal>xsdtojava</goal>-->
- <!--
</goals>-->
- <!-- </execution>-->
- <!-- </executions>-->
- <!-- <dependencies>-->
- <!-- <dependency>-->
- <!--
<groupId>org.apache.cxf</groupId>-->
- <!--
<artifactId>cxf-tools-xjc-dv</artifactId>-->
- <!--
<version>${project.version}</version>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!--
<groupId>org.apache.cxf</groupId>-->
- <!--
<artifactId>cxf-common-utilities</artifactId>-->
- <!--
<version>${project.version}</version>-->
- <!-- </dependency>-->
- <!-- </dependencies>-->
- <!-- </plugin>-->
- </plugins>
- </build>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache CXF Runtime WS Security</name>
+ <url>http://cwiki.apache.org/CXF</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.0-incubator-RC-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <!-- We should get these properly uploaded -->
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>133</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/ws/security
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/ws/security
+ </developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <!-- <plugin>-->
+ <!--
<groupId>org.apache.cxf</groupId>-->
+ <!--
<artifactId>cxf-common-xsd</artifactId>-->
+ <!--
<version>${project.version}</version>-->
+ <!-- <executions>-->
+ <!-- <execution>-->
+ <!--
<id>generate-sources</id>-->
+ <!--
<phase>generate-sources</phase>-->
+ <!--
<configuration>-->
+ <!--
<sourceRoot>-->
+ <!--
${basedir}/target/generated/src/main/java-->
+ <!--
</sourceRoot>-->
+ <!--
<xsdOptions>-->
+ <!--
<xsdOption>-->
+ <!--
<xsd>-->
+ <!--
${basedir}/src/main/resources/schemas/ws-security-policy.xsd-->
+ <!--
</xsd>-->
+ <!--
<bindingFile>-->
+ <!--
${basedir}/src/main/resources/schemas/ws-security-policy.xjb-->
+ <!--
</bindingFile>-->
+ <!--
<catalog>-->
+ <!--
${basedir}/src/main/resources/schemas/catalog.cat-->
+ <!--
</catalog>-->
+ <!--
<deleteDirs>-->
+ <!--
<deleteDir>-->
+ <!--
${basedir}/target/generated/src/main/java/org/apache/cxf/ws/security/policy-->
+ <!--
</deleteDir>-->
+ <!--
</deleteDirs>-->
+ <!--
</xsdOption>-->
+ <!--
</xsdOptions>-->
+ <!--
</configuration>-->
+ <!-- <goals>-->
+ <!--
<goal>xsdtojava</goal>-->
+ <!-- </goals>-->
+ <!-- </execution>-->
+ <!-- </executions>-->
+ <!-- <dependencies>-->
+ <!-- <dependency>-->
+ <!--
<groupId>org.apache.cxf</groupId>-->
+ <!--
<artifactId>cxf-tools-xjc-dv</artifactId>-->
+ <!--
<version>${project.version}</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!--
<groupId>org.apache.cxf</groupId>-->
+ <!--
<artifactId>cxf-common-utilities</artifactId>-->
+ <!--
<version>${project.version}</version>-->
+ <!-- </dependency>-->
+ <!-- </dependencies>-->
+ <!-- </plugin>-->
+ </plugins>
+ </build>
</project>
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
Tue Mar 27 10:25:28 2007
@@ -181,55 +181,80 @@
Node node = null;
NodeList nestedJaxbNodes = getNestedJaxbBinding(bindings);
+ NodeList nestedJaxbSchemaBindingNodes =
getNestedJaxbSchemaBinding(bindings);
ContextImpl ctx = new ContextImpl(bindings);
node = queryXPathNode(wsdlNode, ctx, expression);
- if (node != null && nestedJaxbNodes.getLength() == 0) {
+ if (node != null
+ && nestedJaxbNodes.getLength() == 0
+ && nestedJaxbSchemaBindingNodes.getLength() == 0) {
copyBindingsToWsdl(node, bindings, ctx);
}
if (node != null && nestedJaxbNodes.getLength() != 0) {
// append xmlns:jaxb and jaxb:version attribute for schema
- for (int i = 0; i < nestedJaxbNodes.getLength(); i++) {
- Node jaxbNode = nestedJaxbNodes.item(0);
+ Node jaxbNode = nestedJaxbNodes.item(0);
- String xpathExpress = DOMUtils.getAttribute(jaxbNode,
"node");
+ String xpathExpress = DOMUtils.getAttribute(jaxbNode, "node");
- Node schemaNode = getSchemaNode(node);
+ Node schemaNode = getSchemaNode(node);
- ctx = new ContextImpl(bindings);
- Node targetNode = queryXPathNode(schemaNode, ctx,
xpathExpress);
- //@@TODO - copy namespaces
- Element schemaElement = (Element)schemaNode;
- // Element targetElement = (Element)targetNode;
-
- String jaxbPrefix =
schemaElement.lookupPrefix(ToolConstants.NS_JAXB_BINDINGS);
- if (jaxbPrefix == null) {
- schemaElement.setAttribute("xmlns:jaxb",
ToolConstants.NS_JAXB_BINDINGS);
- schemaElement.setAttribute("jaxb:version", "2.0");
- }
-
- // append jaxb appinfo for value node
- Element annoElement =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
-
"annotation");
- Element appinfoEle =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
-
"appinfo");
-
- annoElement.appendChild(appinfoEle);
-
- for (int j = 0; j < jaxbNode.getChildNodes().getLength();
j++) {
- Node cloneNode =
ProcessorUtil.cloneNode(node.getOwnerDocument(), jaxbNode
- .getChildNodes().item(j), true);
- appinfoEle.appendChild(cloneNode);
- }
-
- if (targetNode.getChildNodes().getLength() > 0) {
- targetNode.insertBefore(annoElement,
targetNode.getChildNodes().item(0));
- } else {
- targetNode.appendChild(annoElement);
- }
+ ctx = new ContextImpl(bindings);
+ Node targetNode = queryXPathNode(schemaNode, ctx,
xpathExpress);
+ //@@TODO - copy namespaces
+ Element schemaElement = (Element)schemaNode;
+ // Element targetElement = (Element)targetNode;
+
+ String jaxbPrefix =
schemaElement.lookupPrefix(ToolConstants.NS_JAXB_BINDINGS);
+ if (jaxbPrefix == null) {
+ schemaElement.setAttribute("xmlns:jaxb",
ToolConstants.NS_JAXB_BINDINGS);
+ schemaElement.setAttribute("jaxb:version", "2.0");
}
+
+ // append jaxb appinfo for value node
+ Element annoElement =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
+
"annotation");
+ Element appinfoEle =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
+
"appinfo");
+
+ annoElement.appendChild(appinfoEle);
+
+ for (int j = 0; j < jaxbNode.getChildNodes().getLength(); j++)
{
+ Node cloneNode =
ProcessorUtil.cloneNode(node.getOwnerDocument(), jaxbNode
+ .getChildNodes().item(j), true);
+ appinfoEle.appendChild(cloneNode);
+ }
+
+ if (targetNode.getChildNodes().getLength() > 0) {
+ targetNode.insertBefore(annoElement,
targetNode.getChildNodes().item(0));
+ } else {
+ targetNode.appendChild(annoElement);
+ }
+ } else if (node != null &&
nestedJaxbSchemaBindingNodes.getLength() != 0) {
+ Element schemaElement = (Element)node;
+ Node jaxbNode = nestedJaxbSchemaBindingNodes.item(0);
+ String jaxbPrefix =
schemaElement.lookupPrefix(ToolConstants.NS_JAXB_BINDINGS);
+ if (jaxbPrefix == null) {
+ schemaElement.setAttribute("xmlns:jaxb",
ToolConstants.NS_JAXB_BINDINGS);
+ schemaElement.setAttribute("jaxb:version", "2.0");
+ }
+ // append jaxb appinfo for value node
+ Element annoElement =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
+
"annotation");
+ Element appinfoEle =
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI,
+
"appinfo");
+ annoElement.appendChild(appinfoEle);
+ Node cloneNode =
ProcessorUtil.cloneNode(node.getOwnerDocument(), jaxbNode, true);
+
+ appinfoEle.appendChild(cloneNode);
+
+ if (schemaElement.getChildNodes().getLength() > 0) {
+ schemaElement.insertBefore(annoElement,
schemaElement.getChildNodes().item(0));
+ } else {
+ schemaElement.appendChild(annoElement);
+ }
}
+
}
Element[] children = getChildElements(bindings,
ToolConstants.NS_JAXWS_BINDINGS);
@@ -477,6 +502,9 @@
private NodeList getNestedJaxbBinding(Element bindings) {
return bindings.getElementsByTagNameNS(ToolConstants.NS_JAXB_BINDINGS,
"bindings");
+ }
+ private NodeList getNestedJaxbSchemaBinding(Element bindings) {
+ return bindings.getElementsByTagNameNS(ToolConstants.NS_JAXB_BINDINGS,
"schemaBindings");
}
public Element getCustomizedWSDLElement() {
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/MIMEProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/MIMEProcessor.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/MIMEProcessor.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/MIMEProcessor.java
Tue Mar 27 10:25:28 2007
@@ -84,21 +84,22 @@
jp.setClassName(mimeJavaType);
}
} else if (JavaType.Style.OUT.equals(style)) {
- if (jm.getReturn().getClassName().equals("void")) {
- // this is actually an in/out param...
- String paramName =
ProcessorUtil.mangleNameToVariableName(mimeContent.getPart());
- JavaParameter jp = jm.getParameter(paramName);
- if (jp == null) {
- Message message = new
Message("MIMEPART_CANNOT_MAP", LOG, mimeContent
- .getPart());
- throw new ToolException(message);
- }
- jp.setClassName(mimeJavaType);
- jp.setHolderClass(mimeJavaType);
- } else if
(!jm.getReturn().getClassName().equals(mimeJavaType)) {
- // jm.getReturn().setType(mimeJavaType);
- jm.getReturn().setClassName(mimeJavaType);
+ String paramName =
ProcessorUtil.mangleNameToVariableName(mimeContent.getPart());
+ JavaType jp = jm.getParameter(paramName);
+ if (jp == null) {
+ //check return
+ if (paramName.equals(jm.getReturn().getName())) {
+ jp = jm.getReturn();
+ }
+ } else {
+ ((JavaParameter)jp).setHolderClass(mimeJavaType);
}
+ if (jp == null) {
+ Message message = new
Message("MIMEPART_CANNOT_MAP", LOG, mimeContent
+ .getPart());
+ throw new ToolException(message);
+ }
+ jp.setClassName(mimeJavaType);
}
}
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
Tue Mar 27 10:25:28 2007
@@ -63,7 +63,7 @@
}
@SuppressWarnings("unchecked")
- public void processMethod(JavaMethod method, OperationInfo operation,
+ void processMethod(JavaMethod method, OperationInfo operation,
JAXWSBinding globalBinding) throws ToolException
{
if (isAsynCMethod(method)) {
return;
@@ -114,9 +114,6 @@
|| opBinding != null && opBinding.isEnableMime()) {
method.setMimeEnable(true);
}
-
-
-
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
Tue Mar 27 10:25:28 2007
@@ -36,6 +36,7 @@
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.common.model.JavaInterface;
import org.apache.cxf.tools.common.model.JavaModel;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
import
org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper.InterfaceMapper;
public class PortTypeProcessor extends AbstractProcessor {
@@ -49,14 +50,21 @@
operationMap.clear();
JavaModel jmodel = context.get(JavaModel.class);
- // TODO: add cusomizing
- //intf.setJAXWSBinding(customizing(jmodel, portType));
-
//intf.setHandlerChains(CustomizationParser.getInstance().getHandlerChains());
InterfaceInfo interfaceInfo = serviceInfo.getInterface();
+
JavaInterface intf = new InterfaceMapper(context).map(interfaceInfo);
intf.setJavaModel(jmodel);
+
+ JAXWSBinding jaxwsBinding =
serviceInfo.getDescription().getExtensor(JAXWSBinding.class);
+ JAXWSBinding infBinding =
interfaceInfo.getDescription().getExtensor(JAXWSBinding.class);
+ if (infBinding != null && infBinding.getPackage() != null) {
+ intf.setPackageName(infBinding.getPackage());
+ } else if (jaxwsBinding != null && jaxwsBinding.getPackage() != null) {
+ intf.setPackageName(jaxwsBinding.getPackage());
+ }
+
Element handler = (Element)context.get(ToolConstants.HANDLER_CHAIN);
intf.setHandlerChains(handler);
@@ -71,7 +79,7 @@
OperationProcessor operationProcessor = new
OperationProcessor(context);
operationProcessor.process(intf, operation);
}
- //Fixed issue 305772
+
jmodel.setLocation(intf.getLocation());
jmodel.addInterface(intf.getName(), intf);
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Tue Mar 27 10:25:28 2007
@@ -173,12 +173,22 @@
JAXWSBinding infBinding = infInfo.getExtensor(JAXWSBinding.class);
- if (infBinding != null && !infBinding.isEnableAsyncMapping()) {
- jaxwsBinding.setEnableAsyncMapping(false);
- }
+ if (infBinding != null) {
+ if (!infBinding.isEnableAsyncMapping()) {
+ jaxwsBinding.setEnableAsyncMapping(false);
+ }
- if (infBinding != null && !infBinding.isEnableWrapperStyle()) {
- jaxwsBinding.setEnableWrapperStyle(false);
+ if (!infBinding.isEnableWrapperStyle()) {
+ jaxwsBinding.setEnableWrapperStyle(false);
+ }
+
+ if (infBinding.getPackage() != null) {
+ jaxwsBinding.setPackage(infBinding.getPackage());
+ }
+ }
+
+ if (jaxwsBinding.getPackage() != null) {
+ jport.setPackageName(jaxwsBinding.getPackage());
}
if (infBinding != null && infBinding.getJaxwsClass() != null
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
Tue Mar 27 10:25:28 2007
@@ -50,7 +50,6 @@
env = new ToolContext();
}
-
public void testBuildDefinitionWithXMLBinding() {
String qname = "http://apache.org/hello_world_xml_http/bare";;
String wsdlUrl =
getClass().getResource("hello_world_xml_bare.wsdl").toString();
@@ -201,5 +200,4 @@
.getJaxwsPara().getMessageName());
assertEquals("customized parameter name does not parsered", "num1",
binding.getJaxwsPara().getName());
}
-
}
Modified:
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=523006&r1=523005&r2=523006
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Tue Mar 27 10:25:28 2007
@@ -72,7 +72,6 @@
env = null;
}
-
public void testRPCLit() throws Exception {
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/hello_world_rpc_lit.wsdl"));
