JBossWS SVN: r8461 - in stack/metro/trunk: modules/server and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-14 02:18:34 -0400 (Tue, 14 Oct 2008)
New Revision: 8461
Modified:
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Removing dependency on jbossws-framework in server and client modules
Modified: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/trunk/modules/client/pom.xml 2008-10-13 17:59:37 UTC (rev 8460)
+++ stack/metro/trunk/modules/client/pom.xml 2008-10-14 06:18:34 UTC (rev 8461)
@@ -23,10 +23,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
@@ -98,7 +94,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path>
+ <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wstx.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2008-10-13 17:59:37 UTC (rev 8460)
+++ stack/metro/trunk/modules/server/pom.xml 2008-10-14 06:18:34 UTC (rev 8461)
@@ -24,10 +24,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-13 17:59:37 UTC (rev 8460)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-14 06:18:34 UTC (rev 8461)
@@ -33,7 +33,6 @@
<include>*:jaxws-rt:jar</include>
<include>*:jaxws-tools:jar</include>
<include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
<include>*:jsr181-api:jar</include>
<include>*:jsr250-api:jar</include>
@@ -46,7 +45,6 @@
<include>*:stax-ex:jar</include>
<include>*:streambuffer:jar</include>
<include>*:txnannprocessor:jar</include>
- <include>*:wsdl4j:jar</include>
<include>*:xmldsig:jar</include>
<include>*:xmlsec:jar</include>
<include>*:xws-security:jar</include>
17 years, 2 months
JBossWS SVN: r8460 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 13:59:37 -0400 (Mon, 13 Oct 2008)
New Revision: 8460
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
Log:
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-10-13 17:28:17 UTC (rev 8459)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-10-13 17:59:37 UTC (rev 8460)
@@ -94,7 +94,7 @@
private boolean isWrapperGenerationEnabled()
{
- boolean noWrappersGeneration = "true".equalsIgnoreCase(System.getProperty(Constants.NO_WRAPPERS_GENERATION));
+ boolean noWrappersGeneration = Boolean.getBoolean(Constants.NO_WRAPPERS_GENERATION);
if (noWrappersGeneration)
Logger.getLogger(this.getClass()).debug("Wrapper generation disabled");
return !noWrappersGeneration;
17 years, 2 months
JBossWS SVN: r8459 - stack/native/trunk/modules/core.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 13:28:17 -0400 (Mon, 13 Oct 2008)
New Revision: 8459
Modified:
stack/native/trunk/modules/core/pom.xml
Log:
Removing dependency on jbossws-framework
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-10-13 16:22:20 UTC (rev 8458)
+++ stack/native/trunk/modules/core/pom.xml 2008-10-13 17:28:17 UTC (rev 8459)
@@ -31,10 +31,6 @@
<artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-jaxws-ext</artifactId>
<version>${version}</version>
17 years, 2 months
JBossWS SVN: r8458 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 12:22:20 -0400 (Mon, 13 Oct 2008)
New Revision: 8458
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
Log:
[JBWS-2183] Refactor test as cxf uses different binding name & namespace in the wsdl
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2008-10-13 15:44:40 UTC (rev 8457)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2008-10-13 16:22:20 UTC (rev 8458)
@@ -22,15 +22,16 @@
package org.jboss.test.ws.jaxws.jbws2183;
import java.net.URL;
+import java.util.Iterator;
import java.util.List;
+import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap12.SOAP12Binding;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
import junit.framework.Test;
@@ -54,16 +55,19 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
assertNotNull(wsdlDefinition);
- List extElements = wsdlDefinition.getBinding(new QName("http://www.jboss.org/jbws2183","TestServiceBinding")).getExtensibilityElements();
- boolean found = false;
- for (int i = 0; i < extElements.size(); i++)
+ for (Iterator it = wsdlDefinition.getAllBindings().values().iterator(); it.hasNext(); )
{
- ExtensibilityElement extElement = (ExtensibilityElement)extElements.get(i);
- if (extElement instanceof SOAP12Binding)
- found = true;
- else if (extElement instanceof SOAPBinding)
- fail("SOAP 1.1 Binding found!");
+ List extElements = ((Binding)it.next()).getExtensibilityElements();
+ boolean found = false;
+ for (int i = 0; i < extElements.size(); i++)
+ {
+ ExtensibilityElement extElement = (ExtensibilityElement)extElements.get(i);
+ if (extElement instanceof SOAP12Binding)
+ found = true;
+ else if (extElement instanceof SOAPBinding)
+ fail("SOAP 1.1 Binding found!");
+ }
+ assertTrue("SOAP 1.2 Binding not found!",found);
}
- assertTrue("SOAP 1.2 Binding not found!",found);
}
}
17 years, 2 months
JBossWS SVN: r8457 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 11:44:40 -0400 (Mon, 13 Oct 2008)
New Revision: 8457
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
Log:
Forgot to change method name
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2008-10-13 15:44:28 UTC (rev 8456)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2008-10-13 15:44:40 UTC (rev 8457)
@@ -48,7 +48,7 @@
return new JBossWSTestSetup(JBWS2183TestCase.class, "jaxws-jbws2183.jar");
}
- public void testAccessInventoryServiceWsdl() throws Exception
+ public void testWsdl() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2183/TestServiceImpl?wsdl");
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
17 years, 2 months
JBossWS SVN: r8456 - stack/metro/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 11:44:28 -0400 (Mon, 13 Oct 2008)
New Revision: 8456
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2183][JBWS-2127] Excluding test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-13 15:42:25 UTC (rev 8455)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-13 15:44:28 UTC (rev 8456)
@@ -16,6 +16,7 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-13 15:42:25 UTC (rev 8455)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-13 15:44:28 UTC (rev 8456)
@@ -13,6 +13,7 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-13 15:42:25 UTC (rev 8455)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-13 15:44:28 UTC (rev 8456)
@@ -13,6 +13,7 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-13 15:42:25 UTC (rev 8455)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-10-13 15:44:28 UTC (rev 8456)
@@ -10,6 +10,7 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-13 15:42:25 UTC (rev 8455)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-10-13 15:44:28 UTC (rev 8456)
@@ -10,6 +10,7 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
org/jboss/test/ws/jaxws/jbws1702/**
17 years, 2 months
JBossWS SVN: r8455 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 11:42:25 -0400 (Mon, 13 Oct 2008)
New Revision: 8455
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestService.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestServiceImpl.java
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2183] Adding testcase
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-10-13 11:36:31 UTC (rev 8454)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-10-13 15:42:25 UTC (rev 8455)
@@ -515,6 +515,14 @@
<include name="schema/**"/>
</webinf>
</war>
+
+ <!-- jaxws-jbws2183 -->
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2183.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2183/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2183/**/*TestCase.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-jbws2218 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2218.jar">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2008-10-13 15:42:25 UTC (rev 8455)
@@ -0,0 +1,69 @@
+/*
+ * 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.jbws2183;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * @author alessio.soldano(a)jboss.org
+ * @since 13-Oct-2008
+ */
+public class JBWS2183TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2183TestCase.class, "jaxws-jbws2183.jar");
+ }
+
+ public void testAccessInventoryServiceWsdl() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2183/TestServiceImpl?wsdl");
+ WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+ Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
+ assertNotNull(wsdlDefinition);
+ List extElements = wsdlDefinition.getBinding(new QName("http://www.jboss.org/jbws2183","TestServiceBinding")).getExtensibilityElements();
+ boolean found = false;
+ for (int i = 0; i < extElements.size(); i++)
+ {
+ ExtensibilityElement extElement = (ExtensibilityElement)extElements.get(i);
+ if (extElement instanceof SOAP12Binding)
+ found = true;
+ else if (extElement instanceof SOAPBinding)
+ fail("SOAP 1.1 Binding found!");
+ }
+ assertTrue("SOAP 1.2 Binding not found!",found);
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestService.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestService.java 2008-10-13 15:42:25 UTC (rev 8455)
@@ -0,0 +1,34 @@
+/*
+ * 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.jbws2183;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+@WebService(targetNamespace = "http://www.jboss.org/jbws2183")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
+(a)BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
+public interface TestService
+{
+ public String echo(String message);
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestServiceImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestServiceImpl.java 2008-10-13 15:42:25 UTC (rev 8455)
@@ -0,0 +1,43 @@
+/*
+ * 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.jbws2183;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.xml.ws.BindingType;
+
+import org.jboss.logging.Logger;
+
+@WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws2183.TestService")
+@Stateless
+(a)BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
+public class TestServiceImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(TestServiceImpl.class);
+
+ public String echo(String message)
+ {
+ log.info("echo:" + message);
+ return "Echo: " + message;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2183/TestServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 2 months
JBossWS SVN: r8454 - in stack/native/trunk/modules: embedded and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-13 07:36:31 -0400 (Mon, 13 Oct 2008)
New Revision: 8454
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/embedded/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
Updating dependencies
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-10-13 11:21:41 UTC (rev 8453)
+++ stack/native/trunk/modules/core/pom.xml 2008-10-13 11:36:31 UTC (rev 8454)
@@ -16,7 +16,7 @@
<properties>
<jboss.jbosssx.version>2.0.2.CR6</jboss.jbosssx.version>
- <jboss.microcontainer.version>2.0.0.CR1</jboss.microcontainer.version>
+ <jboss.microcontainer.version>2.0.0.CR2</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
Modified: stack/native/trunk/modules/embedded/pom.xml
===================================================================
--- stack/native/trunk/modules/embedded/pom.xml 2008-10-13 11:21:41 UTC (rev 8453)
+++ stack/native/trunk/modules/embedded/pom.xml 2008-10-13 11:36:31 UTC (rev 8454)
@@ -15,7 +15,7 @@
</parent>
<properties>
- <jboss.microcontainer.version>2.0.0.CR1</jboss.microcontainer.version>
+ <jboss.microcontainer.version>2.0.0.CR2</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:21:41 UTC (rev 8453)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:36:31 UTC (rev 8454)
@@ -74,7 +74,7 @@
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>2.1.0.GA</version>
+ <version>2.1.1.CR7</version>
<scope>test</scope>
</dependency>
<!-- JAXR samples -->
17 years, 2 months
JBossWS SVN: r8453 - in stack/native/trunk/modules: core/src/main/resources and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 07:21:41 -0400 (Mon, 13 Oct 2008)
New Revision: 8453
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractES + AbstractAspectizedES to common
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-13 11:03:39 UTC (rev 8452)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-13 11:21:41 UTC (rev 8453)
@@ -1,58 +0,0 @@
-/*
- * 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.wsf.stack.jbws;
-
-import javax.servlet.ServletConfig;
-
-import org.jboss.wsf.framework.deployment.AbstractAspectizedEndpointServlet;
-import org.jboss.wsf.spi.management.EndpointResolver;
-
-/**
- * An aspectized Native endpoint servlet that is installed for every web service endpoint on AS 5.x series
- * @author richard.opalka(a)jboss.com
- */
-public final class AspectizedEndpointServlet extends AbstractAspectizedEndpointServlet
-{
-
- /**
- * Provides Native specific endpoint resolver
- * @param servletContext servlet context
- * @param servletName servlet name
- * @return new Native specific endpoint resolver
- */
- @Override
- protected final EndpointResolver newEndpointResolver(String servletContext, String servletName)
- {
- return new WebAppResolver(servletContext, servletName);
- }
-
- /**
- * Post init phase hook using template method
- * @param servletConfig servlet config
- */
- @Override
- protected final void postInit(ServletConfig servletConfig)
- {
- ServletConfigHelper.initEndpointConfig(servletConfig, endpoint);
- }
-
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-13 11:03:39 UTC (rev 8452)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-13 11:21:41 UTC (rev 8453)
@@ -21,13 +21,13 @@
*/
package org.jboss.wsf.stack.jbws;
-import org.jboss.wsf.framework.deployment.AbstractEndpointServlet;
import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
import javax.servlet.ServletConfig;
/**
- * A Native endpoint servlet that is installed for every web service endpoint on AS 4.2.x series
+ * A Native endpoint servlet that is installed for every web service endpoint
* @author thomas.diesler(a)jboss.com
* @author heiko.braun(a)jboss.com
* @author richard.opalka(a)jboss.com
Modified: stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-13 11:03:39 UTC (rev 8452)
+++ stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-13 11:21:41 UTC (rev 8453)
@@ -47,7 +47,7 @@
<property name="provides">ContextProperties,StackDescriptor</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</value></entry>
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
<entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSNativeServletAspectManager</value></entry>
</map>
</property>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:03:39 UTC (rev 8452)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-13 11:21:41 UTC (rev 8453)
@@ -24,6 +24,7 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
+ <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -287,7 +288,6 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -328,7 +328,6 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -369,7 +368,6 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -410,7 +408,6 @@
<properties>
<jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
@@ -479,7 +476,6 @@
<properties>
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
17 years, 2 months
JBossWS SVN: r8452 - in stack/metro/trunk/modules: server/src/main/resources and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-13 07:03:39 -0400 (Mon, 13 Oct 2008)
New Revision: 8452
Removed:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring AbstractES + AbstractAspectizedES to common
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java 2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/AspectizedEndpointServlet.java 2008-10-13 11:03:39 UTC (rev 8452)
@@ -1,46 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-import org.jboss.wsf.framework.deployment.AbstractAspectizedEndpointServlet;
-import org.jboss.wsf.spi.management.EndpointResolver;
-
-/**
- * An aspectized Metro endpoint servlet that is installed for every web service endpoint on AS 5.x series
- * @author richard.opalka(a)jboss.com
- */
-public final class AspectizedEndpointServlet extends AbstractAspectizedEndpointServlet
-{
-
- /**
- * Provides Metro specific endpoint resolver
- * @param servletContext servlet context
- * @param servletName servlet name
- * @return new Metro specific endpoint resolver
- */
- @Override
- protected final EndpointResolver newEndpointResolver(String servletContext, String servletName)
- {
- return new WebAppResolver(servletContext, servletName);
- }
-
-}
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-10-13 11:03:39 UTC (rev 8452)
@@ -22,10 +22,10 @@
package org.jboss.wsf.stack.metro;
import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.framework.deployment.AbstractEndpointServlet;
+import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
/**
- * A Metro endpoint servlet that is installed for every web service endpoint on AS 4.2.x series
+ * A Metro endpoint servlet that is installed for every web service endpoint
* @author thomas.diesler(a)jboss.com
* @author heiko.braun(a)jboss.com
* @author richard.opalka(a)jboss.com
Modified: stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-13 11:03:39 UTC (rev 8452)
@@ -51,7 +51,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</value></entry>
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
<entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSMetroServletAspectManager</value></entry>
</map>
</property>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-10-13 10:58:13 UTC (rev 8451)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-10-13 11:03:39 UTC (rev 8452)
@@ -24,6 +24,7 @@
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
+ <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<!-- Modules -->
@@ -293,7 +294,6 @@
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -339,7 +339,6 @@
<properties>
<jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -385,7 +384,6 @@
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -431,7 +429,6 @@
<properties>
<jboss.version>5.0.0.CR2</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- JBWS-2263 -->
@@ -495,7 +492,6 @@
<properties>
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss501</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.metro.AspectizedEndpointServlet</endpoint.servlet>
</properties>
<dependencies>
<!-- JBWS-2263 -->
17 years, 2 months