JBossWS SVN: r9228 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-04 04:46:09 -0500 (Wed, 04 Feb 2009)
New Revision: 9228
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Log:
[JBWS-2512] fallback only if there's no exact match
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-03 18:59:10 UTC (rev 9227)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-04 09:46:09 UTC (rev 9228)
@@ -70,17 +70,21 @@
// Find destination based on request URI
String requestURI = req.getRequestURI();
Collection<ServletDestination> destinations = cxfTransport.getDestinations();
+ String exactMatch = null;
+ ServletDestination returnValue = null;
for (ServletDestination destination : destinations)
{
EndpointInfo endpointInfo = destination.getEndpointInfo();
String address = endpointInfo.getAddress();
// Fix invalid leading slash
+ /*
if (address.startsWith("/http://"))
{
address = address.substring(1);
endpointInfo.setAddress(address);
}
+ */
String path = address;
try
@@ -92,13 +96,20 @@
// ignore
}
- if (requestURI.startsWith(path))
+ if (requestURI.equals(path))
{
- return destination;
+ return destination; // exact match
}
+ else if (requestURI.startsWith(path))
+ {
+ returnValue = destination; // fallback
+ }
}
- throw new ServletException("Cannot obtain destination for: " + requestURI);
+ if (returnValue == null)
+ throw new ServletException("Cannot obtain destination for: " + requestURI);
+
+ return returnValue;
}
/**
15 years, 3 months
JBossWS SVN: r9227 - stack/cxf/trunk/modules/server.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 13:59:10 -0500 (Tue, 03 Feb 2009)
New Revision: 9227
Modified:
stack/cxf/trunk/modules/server/pom.xml
Log:
[JBWS-1744]
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-03 18:55:48 UTC (rev 9226)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-03 18:59:10 UTC (rev 9227)
@@ -122,6 +122,14 @@
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ </dependency>
+ <dependency>
<groupId>apache-velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
15 years, 3 months
JBossWS SVN: r9226 - in stack/cxf/trunk: modules/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 13:55:48 -0500 (Tue, 03 Feb 2009)
New Revision: 9226
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/pom.xml
Log:
[JBWS-1744] Further fix at the wsconsume classpath
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-02-03 18:36:30 UTC (rev 9225)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-02-03 18:55:48 UTC (rev 9226)
@@ -100,6 +100,14 @@
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ </dependency>
+ <dependency>
<groupId>apache-velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-02-03 18:36:30 UTC (rev 9225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-02-03 18:55:48 UTC (rev 9226)
@@ -66,6 +66,8 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-core.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-databinding-jaxb.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-02-03 18:36:30 UTC (rev 9225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-02-03 18:55:48 UTC (rev 9226)
@@ -100,6 +100,8 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-core.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-databinding-jaxb.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-03 18:36:30 UTC (rev 9225)
+++ stack/cxf/trunk/pom.xml 2009-02-03 18:55:48 UTC (rev 9226)
@@ -285,6 +285,16 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<version>${jaxrpc.api.version}</version>
15 years, 3 months
JBossWS SVN: r9225 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 13:36:30 -0500 (Tue, 03 Feb 2009)
New Revision: 9225
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
Log:
[JBWS-1774] Fixing script classpath
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-02-03 18:25:54 UTC (rev 9224)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-02-03 18:36:30 UTC (rev 9225)
@@ -68,8 +68,11 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/xml-resolver.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Execute the JVM
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-02-03 18:25:54 UTC (rev 9224)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-02-03 18:36:30 UTC (rev 9225)
@@ -102,8 +102,11 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/XmlSchema.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/xml-resolver.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wsdl4j.jar"
###
15 years, 3 months
JBossWS SVN: r9224 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 13:25:54 -0500 (Tue, 03 Feb 2009)
New Revision: 9224
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
Log:
[JBWS-1774] Fixing script classpath
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-03 17:50:18 UTC (rev 9223)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-03 18:25:54 UTC (rev 9224)
@@ -70,6 +70,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-collections.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
@@ -79,6 +80,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-03 17:50:18 UTC (rev 9223)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-03 18:25:54 UTC (rev 9224)
@@ -106,6 +106,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-tools-common.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-collections.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
@@ -115,6 +116,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
15 years, 3 months
JBossWS SVN: r9223 - in stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws: handler and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 12:50:18 -0500 (Tue, 03 Feb 2009)
New Revision: 9223
Added:
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Binding21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Endpoint21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/WebServiceContext21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/MessageContext21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/Provider21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/ServiceDelegate21.java
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/
stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java
Log:
[JBWS-2441] Adding deprecated old 2.1 classes, for backaward compatibility reasons
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Binding21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Binding21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Binding21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public interface Binding21 extends Binding
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Binding21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Endpoint21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Endpoint21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Endpoint21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public abstract class Endpoint21 extends Endpoint
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Endpoint21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public class Service21 extends Service
+{
+
+ protected Service21(URL wsdlDocumentLocation, QName serviceName)
+ {
+ super(wsdlDocumentLocation, serviceName);
+ }
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/Service21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/WebServiceContext21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/WebServiceContext21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/WebServiceContext21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public interface WebServiceContext21 extends WebServiceContext
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/WebServiceContext21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/MessageContext21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/MessageContext21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/MessageContext21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws.handler;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public interface MessageContext21 extends MessageContext
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/handler/MessageContext21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/Provider21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/Provider21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/Provider21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws.spi;
+
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public abstract class Provider21 extends Provider
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/Provider21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/ServiceDelegate21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/ServiceDelegate21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/ServiceDelegate21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws.spi;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public abstract class ServiceDelegate21 extends ServiceDelegate
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/spi/ServiceDelegate21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java
===================================================================
--- stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java (rev 0)
+++ stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java 2009-02-03 17:50:18 UTC (rev 9223)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws.wsaddressing;
+
+import javax.xml.ws.BindingProvider;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ */
+@Deprecated
+public interface BindingProvider21 extends BindingProvider
+{
+
+}
Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/javax/xml/ws/wsaddressing/BindingProvider21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 3 months
JBossWS SVN: r9222 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 08:50:24 -0500 (Tue, 03 Feb 2009)
New Revision: 9222
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Further increasing MaxPermSize
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-03 11:51:08 UTC (rev 9221)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-03 13:50:24 UTC (rev 9222)
@@ -17,7 +17,7 @@
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
- <surefire.memory.args>-Xmx512m -XX:MaxPermSize=128m</surefire.memory.args>
+ <surefire.memory.args>-Xmx512m -XX:MaxPermSize=192m</surefire.memory.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
15 years, 3 months
JBossWS SVN: r9221 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 06:51:08 -0500 (Tue, 03 Feb 2009)
New Revision: 9221
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-1774] Enabling tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -67,11 +67,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -67,11 +67,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -67,11 +67,6 @@
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -74,11 +74,6 @@
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -74,11 +74,6 @@
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-03 11:29:08 UTC (rev 9220)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-03 11:51:08 UTC (rev 9221)
@@ -74,11 +74,6 @@
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
-# [JBWS-1774] Provide tools implementation for CXF
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/smoke/tools/**
-
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
15 years, 3 months
JBossWS SVN: r9220 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 06:29:08 -0500 (Tue, 03 Feb 2009)
New Revision: 9220
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Increasing MaxPermSize to 128 MB with surefire
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-03 11:20:15 UTC (rev 9219)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-03 11:29:08 UTC (rev 9220)
@@ -17,6 +17,7 @@
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
+ <surefire.memory.args>-Xmx512m -XX:MaxPermSize=128m</surefire.memory.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
@@ -240,7 +241,7 @@
</property>
</activation>
<properties>
- <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args}</surefire.jvm.args>
+ <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args} ${surefire.jdwp.args}</surefire.jvm.args>
</properties>
</profile>
<profile>
@@ -251,7 +252,7 @@
</property>
</activation>
<properties>
- <surefire.jvm.args>${surefire.security.args}</surefire.jvm.args>
+ <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args}</surefire.jvm.args>
</properties>
</profile>
15 years, 3 months
JBossWS SVN: r9219 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-03 06:20:15 -0500 (Tue, 03 Feb 2009)
New Revision: 9219
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
Allowing isIntegrationXYZ() from WSConsumerPlugin
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-02-03 10:43:19 UTC (rev 9218)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-02-03 11:20:15 UTC (rev 9219)
@@ -26,6 +26,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
import java.util.List;
import java.util.LinkedList;
import java.util.StringTokenizer;
@@ -40,6 +41,9 @@
protected Object delegate = null;
protected ClassLoader origClassLoader;
protected String oldCPProp;
+ protected boolean integrationNative = false;
+ protected boolean integrationMetro = false;
+ protected boolean integrationCXF = false;
protected void dispatch(String methodName) throws Exception
{
@@ -53,9 +57,30 @@
throw e;
}
}
+
+ protected void setDelegate(Class<?> clazz) throws Exception
+ {
+ delegate = clazz.newInstance();
+ List<String> list = new LinkedList<String>();
+ for (Class<?> c : clazz.getInterfaces())
+ {
+ list.add(c.getName());
+ }
+ if (list.contains(StackConfigurable.class.getName()))
+ {
+ clazz.getMethod("setIntegrationNative", boolean.class).invoke(delegate, integrationNative);
+ clazz.getMethod("setIntegrationMetro", boolean.class).invoke(delegate, integrationMetro);
+ clazz.getMethod("setIntegrationCXF", boolean.class).invoke(delegate, integrationCXF);
+ }
+ }
protected void setupClasspath() throws Exception
{
+ if (!(integrationCXF || integrationMetro || integrationNative))
+ {
+ //the integration stack is not set yet, doing it before mangling with the classpath
+ readIntegrationStack();
+ }
String classpath = System.getProperty("surefire.test.class.path");
if (classpath == null) //no maven surefire classpath hacks required
return;
@@ -109,4 +134,11 @@
System.setProperty("java.class.path", oldCPProp);
}
}
+
+ protected void readIntegrationStack()
+ {
+ this.integrationNative = isIntegrationNative();
+ this.integrationMetro = isIntegrationMetro();
+ this.integrationCXF = isIntegrationCXF();
+ }
}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2009-02-03 11:20:15 UTC (rev 9219)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+public interface StackConfigurable
+{
+ public void setIntegrationNative(boolean integrationNative);
+
+ public void setIntegrationMetro(boolean integrationMetro);
+
+ public void setIntegrationCXF(boolean integrationCXF);
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-02-03 10:43:19 UTC (rev 9218)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-02-03 11:20:15 UTC (rev 9219)
@@ -36,8 +36,9 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
+ * @author alessio.soldano(a)jboss.com
*/
-public class WSConsumerPlugin extends JBossWSTest implements WSConsumerPluginDelegate
+public class WSConsumerPlugin extends JBossWSTest implements WSConsumerPluginDelegate, StackConfigurable
{
// Tools delegate. Recreated for every test. See setup(...)
WSContractConsumer consumer;
@@ -49,6 +50,10 @@
boolean toogleMessageOut = Boolean.getBoolean(WSConsumerPlugin.class.getName()+".verbose");
private File workDirectory;
+
+ protected boolean integrationNative;
+ protected boolean integrationMetro;
+ protected boolean integrationCXF;
public WSConsumerPlugin()
@@ -272,11 +277,11 @@
consumer.setTarget("2.1");
consumer.setNoCompile(false);
- //this test is run in binary distribution mode only because the way Maven builds classpath doesn't allow to run the
- //wsimport tool in Native stack from a Surefire test (the jaxws classes are of course loaded from the included
+ //with Native stack, this test is run in binary distribution mode only because the way Maven builds classpath doesn't allow
+ //to run the wsimport tool in Native stack from a Surefire test (the jaxws classes are of course loaded from the included
//jaxws source module and that causes the Sun's ParallelWorldClassLoader to throw an exception as EndpointReference
//is not loaded from a jar resource)
- if (Boolean.getBoolean("binary.distribution"))
+ if (!isIntegrationNative() || Boolean.getBoolean("binary.distribution"))
{
consumeWSDL();
ClassLoader loader = getArtefactClassLoader();
@@ -346,4 +351,37 @@
return loader;
}
+
+ @Override
+ public boolean isIntegrationNative()
+ {
+ return integrationNative;
+ }
+
+ @Override
+ public boolean isIntegrationMetro()
+ {
+ return integrationMetro;
+ }
+
+ @Override
+ public boolean isIntegrationCXF()
+ {
+ return integrationCXF;
+ }
+
+ public void setIntegrationNative(boolean integrationNative)
+ {
+ this.integrationNative = integrationNative;
+ }
+
+ public void setIntegrationMetro(boolean integrationMetro)
+ {
+ this.integrationMetro = integrationMetro;
+ }
+
+ public void setIntegrationCXF(boolean integrationCXF)
+ {
+ this.integrationCXF = integrationCXF;
+ }
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-02-03 10:43:19 UTC (rev 9218)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-02-03 11:20:15 UTC (rev 9219)
@@ -26,6 +26,7 @@
* NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
*/
public class WSConsumerTestCase extends PluginBase implements WSConsumerPluginDelegate
{
@@ -40,8 +41,8 @@
// JBWS-2175
setupClasspath();
- Class wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
- delegate = wscClass.newInstance();
+ Class<?> wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
+ setDelegate(wscClass);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2009-02-03 10:43:19 UTC (rev 9218)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2009-02-03 11:20:15 UTC (rev 9219)
@@ -35,9 +35,9 @@
setupClasspath();
- Class wspClass = Thread.currentThread().getContextClassLoader()
+ Class<?> wspClass = Thread.currentThread().getContextClassLoader()
.loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin");
- delegate = wspClass.newInstance();
+ setDelegate(wspClass);
}
15 years, 3 months