You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/06/23 21:03:03 UTC
svn commit: r957306 - in /cxf/trunk: common/common/
distribution/src/main/release/lib/
distribution/src/main/release/samples/integration/JBI/service-engine/
parent/ rt/bindings/coloc/ rt/databinding/jaxb/ rt/frontend/jaxws/
rt/frontend/js/ rt/testsuppo...
Author: dkulp
Date: Wed Jun 23 19:03:00 2010
New Revision: 957306
URL: http://svn.apache.org/viewvc?rev=957306&view=rev
Log:
Update default for java5 to be JAX-WS 2.2/JAXB 2.2
Modified:
cxf/trunk/common/common/pom.xml
cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/coloc/pom.xml
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/js/pom.xml
cxf/trunk/rt/testsupport/pom.xml
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
cxf/trunk/testutils/pom.xml
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
cxf/trunk/tools/common/pom.xml
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
cxf/trunk/tools/javato/ws/pom.xml
cxf/trunk/tools/wsdlto/core/pom.xml
Modified: cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/common/common/pom.xml (original)
+++ cxf/trunk/common/common/pom.xml Wed Jun 23 19:03:00 2010
@@ -153,7 +153,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -162,6 +162,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Wed Jun 23 19:03:00 2010
@@ -38,7 +38,7 @@ For Java2WSDL and WSDL2Java:
For JAX-WS support:
- geronimo-ws-metadata.jar [6]
-- geronimo-jaxws_2.1_spec-1.0.jar (Or the Sun equivalent) [6]
+- geronimo-jaxws_2.2_spec-1.0.jar (Or the Sun equivalent) [6]
- saaj-api.jar [6]
- saaj-impl.jar [6]
- asm.jar (semi-optional, helps with performance of wrapper types and is
Modified: cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml Wed Jun 23 19:03:00 2010
@@ -40,7 +40,7 @@
<include name="FastInfoset-*.jar"/>
<include name="jaxb*.jar"/>
<include name="neethi-*.jar"/>
- <include name="geronimo-jaxws_2.1_spec-1.0.jar"/>
+ <include name="geronimo-jaxws_2.2_spec-1.0.jar"/>
<include name="geronimo-annotation_1.0_spec-*.jar"/>
<include name="geronimo-ws-metadata_2.0_spec-*.jar"/>
<include name="org.apache.servicemix.specs.jbi-api-*.jar"/>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Jun 23 19:03:00 2010
@@ -911,7 +911,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<version>1.0</version>
</dependency>
<dependency>
@@ -1190,6 +1190,18 @@
<profiles>
<profile>
+ <id>jdk15</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <properties>
+ <jaxb.version>2.2.1</jaxb.version>
+ <jaxb.impl.version>2.2.1.1</jaxb.impl.version>
+ <jaxb.xjc.version>2.2.1.1</jaxb.xjc.version>
+ <jdk.version>1.5</jdk.version>
+ </properties>
+ </profile>
+ <profile>
<id>validateServices</id>
<properties>
<cxf.validateServices>true</cxf.validateServices>
Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Wed Jun 23 19:03:00 2010
@@ -79,7 +79,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
</dependencies>
</profile>
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Wed Jun 23 19:03:00 2010
@@ -116,7 +116,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Wed Jun 23 19:03:00 2010
@@ -272,6 +272,9 @@
<activation>
<jdk>1.5</jdk>
</activation>
+ <properties>
+ <spi-dir>spi-2.2</spi-dir>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -291,7 +294,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -302,6 +305,28 @@
<artifactId>${saaj.impl.artifactId}</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-jaxws22-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/main/jaxws22</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/pom.xml (original)
+++ cxf/trunk/rt/frontend/js/pom.xml Wed Jun 23 19:03:00 2010
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
</dependencies>
Modified: cxf/trunk/rt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/testsupport/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/testsupport/pom.xml (original)
+++ cxf/trunk/rt/testsupport/pom.xml Wed Jun 23 19:03:00 2010
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java Wed Jun 23 19:03:00 2010
@@ -37,6 +37,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.management.InstrumentationManager;
import org.easymock.classextension.EasyMock;
@@ -181,8 +182,8 @@ public class JettyHTTPServerEngineTest e
assertEquals("The jetty http handler did not take effect", response, "string1string2");
engine.addServant(new URL(urlStr2), handler2);
- Set<ObjectName> s = ManagementFactory.getPlatformMBeanServer().
- queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null);
+ Set<ObjectName> s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
+ queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
assertEquals("Could not find 1 Jetty Server: " + s, 1, s.size());
engine.removeServant(new URL(urlStr));
@@ -211,14 +212,14 @@ public class JettyHTTPServerEngineTest e
engine.addServant(new URL(urlStr), handler1);
- Set<ObjectName> s = ManagementFactory.getPlatformMBeanServer().
- queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null);
+ Set<ObjectName> s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
+ queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
assertEquals("Could not find 1 Jetty Server: " + s, 1, s.size());
engine2.addServant(new URL(urlStr2), handler2);
- s = ManagementFactory.getPlatformMBeanServer().
- queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null);
+ s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
+ queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
assertEquals("Could not find 2 Jetty Server: " + s, 2, s.size());
engine.removeServant(new URL(urlStr));
@@ -227,14 +228,14 @@ public class JettyHTTPServerEngineTest e
engine.shutdown();
- s = ManagementFactory.getPlatformMBeanServer().
- queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null);
+ s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
+ queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
assertEquals("Could not find 2 Jetty Server: " + s, 1, s.size());
engine2.shutdown();
- s = ManagementFactory.getPlatformMBeanServer().
- queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null);
+ s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
+ queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
assertEquals("Could not find 0 Jetty Server: " + s, 0, s.size());
factory.destroyForPort(9234);
Modified: cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Wed Jun 23 19:03:00 2010
@@ -92,7 +92,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Wed Jun 23 19:03:00 2010
@@ -169,7 +169,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Wed Jun 23 19:03:00 2010
@@ -153,7 +153,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
</dependencies>
</profile>
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java Wed Jun 23 19:03:00 2010
@@ -29,6 +29,7 @@ import javax.jms.Session;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.jms.testsuite.util.JMSTestUtil;
import org.apache.cxf.testsuite.testcase.MessagePropertiesType;
import org.apache.cxf.testsuite.testcase.TestCaseType;
@@ -60,6 +61,8 @@ public abstract class AbstractSOAPJMSTes
QName qPortName = new QName(namespace, portName);
URL wsdl = getClass().getResource("/wsdl/jms_spec_testsuite.wsdl");
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ BusFactory.setThreadDefaultBus(getBus());
+ BusFactory.setDefaultBus(getBus());
Class<? extends Service> svcls = serviceClass.asSubclass(Service.class);
Constructor<? extends Service> serviceConstructor = svcls.getConstructor(URL.class,
@@ -157,8 +160,12 @@ public abstract class AbstractSOAPJMSTes
// todo messagetype
// todo messageid
if (messageProperties.isSetDeliveryMode()) {
- assertEquals(header.getJMSDeliveryMode(), messageProperties.getDeliveryMode()
- .intValue());
+ int dm = 0;
+ if (header.isSetJMSDeliveryMode()) {
+ dm = header.getJMSDeliveryMode();
+ }
+ assertEquals(dm,
+ messageProperties.getDeliveryMode().intValue());
}
if (messageProperties.isSetPriority()) {
assertEquals(header.getJMSPriority(), messageProperties.getPriority().intValue());
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java Wed Jun 23 19:03:00 2010
@@ -73,6 +73,7 @@ public class SOAPJMSTestSuiteTest extend
assertTrue("server did not launch correctly", launchServer(EmbeddedJMSBrokerLauncher.class,
props, null));
assertTrue("server did not launch correctly", launchServer(Server.class, false));
+ createStaticBus();
}
private void oneWayTest(TestCaseType testcase, JMSSimplePortType port) throws Exception {
@@ -81,6 +82,7 @@ public class SOAPJMSTestSuiteTest extend
Map<String, Object> requestContext = bp.getRequestContext();
JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
+
requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader);
Exception e = null;
try {
Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Wed Jun 23 19:03:00 2010
@@ -265,7 +265,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java Wed Jun 23 19:03:00 2010
@@ -43,7 +43,10 @@ public class EmbeddedJMSBrokerLauncher e
public static void updateWsdlExtensors(Bus bus, String wsdlLocation) {
try {
- Definition def = BusFactory.getDefaultBus().getExtension(WSDLManager.class)
+ if (bus == null) {
+ bus = BusFactory.getThreadDefaultBus();
+ }
+ Definition def = bus.getExtension(WSDLManager.class)
.getDefinition(wsdlLocation);
Map map = def.getAllServices();
for (Object o : map.values()) {
Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Wed Jun 23 19:03:00 2010
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Wed Jun 23 19:03:00 2010
@@ -54,7 +54,8 @@ public class ProcessorTestBase extends A
public static final List<String> DEFAULT_IGNORE_ATTR = Arrays.asList(new String[]{"attributeFormDefault",
"elementFormDefault",
"form",
- "version"});
+ "version",
+ "part@name"});
public static final List<String> DEFAULT_IGNORE_TAG = Arrays.asList(new String[]{"sequence"});
//CHECKSTYLE:OFF
@@ -247,7 +248,9 @@ public class ProcessorTestBase extends A
Map<QName, String> q2,
Collection<String> ignoreAttr) {
for (Map.Entry<QName, String> attr : q1.entrySet()) {
- if (ignoreAttr.contains(attr.getKey().getLocalPart())) {
+ if (ignoreAttr.contains(attr.getKey().getLocalPart())
+ || ignoreAttr.contains(element.getLocalPart() + "@"
+ + attr.getKey().getLocalPart())) {
continue;
}
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java Wed Jun 23 19:03:00 2010
@@ -153,7 +153,8 @@ public class Tag {
return false;
}
for (QName attr : getAttributes().keySet()) {
- if (getIgnoreAttr().contains(attr.getLocalPart())) {
+ if (getIgnoreAttr().contains(attr.getLocalPart())
+ || getIgnoreAttr().contains(getName().getLocalPart() + "@" + attr.getLocalPart())) {
continue;
}
if (!tag.getAttributes().containsKey(attr)) {
Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Wed Jun 23 19:03:00 2010
@@ -217,7 +217,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
</dependencies>
</profile>
Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=957306&r1=957305&r2=957306&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Wed Jun 23 19:03:00 2010
@@ -136,7 +136,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>