JBossWS SVN: r11173 - stack/cxf/trunk/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 12:53:43 -0500 (Mon, 30 Nov 2009)
New Revision: 11173
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2828] Fixing requires/provides of added deployment aspect to please domino ordering on AS trunk
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-11-30 11:45:31 UTC (rev 11172)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-11-30 17:53:43 UTC (rev 11173)
@@ -45,14 +45,16 @@
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
-
+
<bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">ContextProperties</property>
+ <property name="requires">StackDescriptor</property>
+ <property name="provides">JmsEndpointAddress</property>
<property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
- <property name="requires">StackDescriptor</property>
+ <property name="requires">JmsEndpointAddress</property>
+ <property name="provides">ResourceResolver</property>
<property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 4 months
JBossWS SVN: r11172 - stack/native/branches/jbossws-native-3.1.2.SP4.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 06:45:31 -0500 (Mon, 30 Nov 2009)
New Revision: 11172
Modified:
stack/native/branches/jbossws-native-3.1.2.SP4/pom.xml
Log:
Moving to jbossws-common snapshot
Modified: stack/native/branches/jbossws-native-3.1.2.SP4/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP4/pom.xml 2009-11-30 11:43:49 UTC (rev 11171)
+++ stack/native/branches/jbossws-native-3.1.2.SP4/pom.xml 2009-11-30 11:45:31 UTC (rev 11172)
@@ -47,7 +47,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0.SP2</jbossws.common.version>
+ <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<!-- [JBWS-2505] -->
14 years, 5 months
JBossWS SVN: r11171 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 06:43:49 -0500 (Mon, 30 Nov 2009)
New Revision: 11171
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Moving to jbossws-common snapshot
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-11-30 11:40:58 UTC (rev 11170)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-11-30 11:43:49 UTC (rev 11171)
@@ -47,7 +47,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0.SP2</jbossws.common.version>
+ <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<!-- [JBWS-2505] -->
14 years, 5 months
JBossWS SVN: r11170 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 06:40:58 -0500 (Mon, 30 Nov 2009)
New Revision: 11170
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBPAPP-3183] Caching props in EntityResolver
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-11-30 11:05:06 UTC (rev 11169)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-11-30 11:40:58 UTC (rev 11170)
@@ -27,8 +27,12 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.Map;
import java.util.Properties;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
@@ -43,6 +47,12 @@
*/
public class JBossWSEntityResolver extends JBossEntityResolver
{
+ /**
+ * A synchronized weak hash map that keeps entities' properties for each classloader.
+ * Weak keys are used to remove entries when classloaders are garbage collected; values are filenames -> properties.
+ */
+ private static Map<ClassLoader, Map<String, Properties>> propertiesMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, Properties>>());
+
// provide logging
private static final Logger log = Logger.getLogger(JBossWSEntityResolver.class);
@@ -54,12 +64,28 @@
public JBossWSEntityResolver(final String entitiesResource)
{
super();
-
- // load entities
- Properties props = loadEntitiesMappingFromClasspath(entitiesResource);
- if (props.size() == 0)
- throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
+ Properties props = null;
+ ClassLoader loader = this.getClass().getClassLoader();
+ Map<String, Properties> map = propertiesMap.get(loader);
+ if (map != null && map.containsKey(entitiesResource))
+ {
+ props = map.get(entitiesResource);
+ }
+ else
+ {
+ if (map == null)
+ {
+ map = new ConcurrentHashMap<String, Properties>();
+ propertiesMap.put(loader, map);
+ }
+ // load entities
+ props = loadEntitiesMappingFromClasspath(entitiesResource);
+ if (props.size() == 0)
+ throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
+ map.put(entitiesResource, props);
+ }
+
// register entities
String key = null, val = null;
for (Enumeration<Object> keys = props.keys(); keys.hasMoreElements();)
14 years, 5 months
JBossWS SVN: r11169 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 06:05:06 -0500 (Mon, 30 Nov 2009)
New Revision: 11169
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Giving the tests additional 128MB of memory
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-11-30 09:35:36 UTC (rev 11168)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-11-30 11:05:06 UTC (rev 11169)
@@ -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=256m</surefire.memory.args>
+ <surefire.memory.args>-Xmx640m -XX:MaxPermSize=382m</surefire.memory.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
<surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
14 years, 5 months
JBossWS SVN: r11168 - common/trunk/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-30 04:35:36 -0500 (Mon, 30 Nov 2009)
New Revision: 11168
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-2847] Caching props in EntityResolver
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-11-29 16:18:32 UTC (rev 11167)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-11-30 09:35:36 UTC (rev 11168)
@@ -27,8 +27,12 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.Map;
import java.util.Properties;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
@@ -43,6 +47,12 @@
*/
public class JBossWSEntityResolver extends JBossEntityResolver
{
+ /**
+ * A synchronized weak hash map that keeps entities' properties for each classloader.
+ * Weak keys are used to remove entries when classloaders are garbage collected; values are filenames -> properties.
+ */
+ private static Map<ClassLoader, Map<String, Properties>> propertiesMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, Properties>>());
+
// provide logging
private static final Logger log = Logger.getLogger(JBossWSEntityResolver.class);
@@ -54,12 +64,28 @@
public JBossWSEntityResolver(final String entitiesResource)
{
super();
-
- // load entities
- Properties props = loadEntitiesMappingFromClasspath(entitiesResource);
- if (props.size() == 0)
- throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
+ Properties props = null;
+ ClassLoader loader = this.getClass().getClassLoader();
+ Map<String, Properties> map = propertiesMap.get(loader);
+ if (map != null && map.containsKey(entitiesResource))
+ {
+ props = map.get(entitiesResource);
+ }
+ else
+ {
+ if (map == null)
+ {
+ map = new ConcurrentHashMap<String, Properties>();
+ propertiesMap.put(loader, map);
+ }
+ // load entities
+ props = loadEntitiesMappingFromClasspath(entitiesResource);
+ if (props.size() == 0)
+ throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
+ map.put(entitiesResource, props);
+ }
+
// register entities
String key = null, val = null;
for (Enumeration<Object> keys = props.keys(); keys.hasMoreElements();)
14 years, 5 months
JBossWS SVN: r11167 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-11-29 11:18:32 -0500 (Sun, 29 Nov 2009)
New Revision: 11167
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
Log:
[JBPAPP-3178] Missing fault detail in SOAPFault.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-11-27 22:26:16 UTC (rev 11166)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-11-29 16:18:32 UTC (rev 11167)
@@ -498,6 +498,16 @@
</metainf>
</jar>
+ <!-- jaxws-jbws1815 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.ejb3">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF">
+ <include name="wsdl/my-service.wsdl"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-jbws1854 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2009-11-27 22:26:16 UTC (rev 11166)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2009-11-29 16:18:32 UTC (rev 11167)
@@ -72,6 +72,10 @@
/** Factory method for FaultException for a given SOAPFault */
public static SOAPFaultException getSOAPFaultException(SOAPFault soapFault)
{
+
+ if (soapFault == null)
+ throw new IllegalArgumentException("SOAPFault cannot be null");
+
SOAPFaultException faultEx = new SOAPFaultException(soapFault);
Detail detail = soapFault.getDetail();
@@ -155,10 +159,20 @@
try
{
SOAPMessageImpl faultMessage;
+ Throwable cause = reqEx.getCause();
if (reqEx instanceof SOAPFaultException)
{
faultMessage = toSOAPMessage((SOAPFaultException)reqEx);
}
+ /* JAX-WS 6.4.1: When an implementation catches an exception thrown by a
+ * service endpoint implementation and the cause of that exception is an
+ * instance of the appropriate ProtocolException subclass for the protocol
+ * in use, an implementation MUST reflect the information contained in the
+ * ProtocolException subclass within the generated protocol level fault. */
+ else if (cause != null && cause instanceof SOAPFaultException)
+ {
+ faultMessage = toSOAPMessage((SOAPFaultException)cause);
+ }
else if (reqEx instanceof CommonSOAPFaultException)
{
faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx);
@@ -237,23 +251,8 @@
SOAPMessageImpl soapMessage = createSOAPMessage();
SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPFault soapFault;
- /* JAX-WS 6.4.1: When an implementation catches an exception thrown by a
- * service endpoint implementation and the cause of that exception is an
- * instance of the appropriate ProtocolException subclass for the protocol
- * in use, an implementation MUST reflect the information contained in the
- * ProtocolException subclass within the generated protocol level fault. */
- Throwable cause = ex.getCause();
- if (cause instanceof SOAPFaultException)
- {
- populateSOAPFault(soapBody, (SOAPFaultException)cause);
- soapFault = soapBody.getFault();
- }
- else
- {
- soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex));
- }
+ SOAPFault soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex));
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
SerializationContext serContext = msgContext.getSerializationContext();
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815 (from rev 4738, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2007-10-11 12:15:07 UTC (rev 4738)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2009-11-29 16:18:32 UTC (rev 11167)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbws1815;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.soap.Detail;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-import org.w3c.dom.Element;
-
-/**
- * Test case for http://jira.jboss.org/jira/browse/JBWS-1815
- *
- * @author alessio.soldano(a)jboss.com
- * @since 11-Oct-2007
- */
-public class JBWS1815TestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1815/ProviderImpl";
-
- private String msgString =
- "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:my=\"http://www.my-company.it/ws/my-test\">" +
- " <soapenv:Header/>" +
- " <soapenv:Body>" +
- " <my:performTest>" +
- " <my:Code>43</my:Code>" +
- " </my:performTest>" +
- " </soapenv:Body>" +
- "</soapenv:Envelope>";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.ejb3");
- }
-
- public void testWSDLAccess() throws Exception
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- Element wsdl = DOMUtils.parse(wsdlURL.openStream());
- assertNotNull(wsdl);
- }
-
-
- public void testProviderMessage() throws Exception
- {
- try {
- SOAPMessage reqMsg = getRequestMessage();
- URL epURL = new URL(TARGET_ENDPOINT_ADDRESS);
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage resMsg = con.call(reqMsg, epURL);
- SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
- System.out.println("response: " + DOMWriter.printNode(resEnv, false));
- Detail detail = resEnv.getBody().getFault().getDetail();
-// assertNotNull(detail);
- SOAPElement exception = (SOAPElement)detail.getDetailEntries().next();
-// assertNotNull(exception);
-// assertEquals(exception.getNodeName(),"MyWSException");
- SOAPElement message = (SOAPElement)exception.getChildElements().next();
-// assertNotNull(message);
-// assertEquals(message.getNodeName(),"message");
-// assertEquals(message.getValue(),"This is a faked error");
- } catch (Exception e) {
- System.out.println("[FIXME] JBWS-1815: Cannot add fault detail");
- }
- }
-
- private SOAPMessage getRequestMessage() throws SOAPException, IOException
- {
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes()));
- return reqMsg;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java (from rev 4738, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2009-11-29 16:18:32 UTC (rev 11167)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1815;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.xml.soap.Detail;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Element;
+
+/**
+ * Test case for http://jira.jboss.org/jira/browse/JBWS-1815
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Oct-2007
+ */
+public class JBWS1815TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1815/ProviderImpl";
+
+ private String msgString =
+ "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:my=\"http://www.my-company.it/ws/my-test\">" +
+ " <soapenv:Header/>" +
+ " <soapenv:Body>" +
+ " <my:performTest>" +
+ " <my:Code>43</my:Code>" +
+ " </my:performTest>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.ejb3");
+ }
+
+ public void testWSDLAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ Element wsdl = DOMUtils.parse(wsdlURL.openStream());
+ assertNotNull(wsdl);
+ }
+
+ public void testProviderMessage() throws Exception
+ {
+ SOAPMessage reqMsg = getRequestMessage();
+ URL epURL = new URL(TARGET_ENDPOINT_ADDRESS);
+ SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage resMsg = con.call(reqMsg, epURL);
+ SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
+ Detail detail = resEnv.getBody().getFault().getDetail();
+ assertNotNull(detail);
+ SOAPElement exception = (SOAPElement)detail.getDetailEntries().next();
+ assertNotNull(exception);
+ assertEquals(exception.getNodeName(), "MyWSException");
+ SOAPElement message = (SOAPElement)exception.getChildElements().next();
+ assertNotNull(message);
+ assertEquals(message.getNodeName(), "message");
+ assertEquals(message.getValue(), "This is a faked error");
+ }
+
+ private SOAPMessage getRequestMessage() throws SOAPException, IOException
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes()));
+ return reqMsg;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2007-10-11 12:15:07 UTC (rev 4738)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2009-11-29 16:18:32 UTC (rev 11167)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbws1815;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.xml.namespace.QName;
-import javax.xml.soap.Detail;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import org.jboss.wsf.spi.annotation.WebContext;
-
-/**
- * Test impl for http://jira.jboss.org/jira/browse/JBWS-1815
- *
- * @author alessio.soldano(a)jboss.com
- * @since 11-Oct-2007
- */
-@Local
-@Stateless
-@WebServiceProvider(serviceName = "MyTestService",
- portName = "MyTestPort",
- targetNamespace = "http://www.my-company.it/ws/my-test",
- wsdlLocation = "META-INF/wsdl/my-service.wsdl")
-@WebContext(contextRoot = "/jaxws-jbws1815")
-@ServiceMode(value = Service.Mode.MESSAGE)
-public class ProviderImpl implements Provider<SOAPMessage>
-{
-
- public SOAPMessage invoke(SOAPMessage requestSoapMessage)
- {
- SOAPFault theSOAPFault;
- try {
- theSOAPFault = SOAPFactory.newInstance().createFault();
- Detail soapFaultDetail = theSOAPFault.addDetail();
- SOAPElement myFaultElement = soapFaultDetail.addChildElement(new QName("http://www.my-company.it/ws/my-test", "MyWSException"));
- SOAPElement myMessageElement = myFaultElement.addChildElement(new QName("http://www.my-company.it/ws/my-test", "message"));
-// myMessageElement.setNodeValue("This is a faked error"); //wrong: myMessageElement is not a text node
- myMessageElement.setValue("This is a faked error"); //right: this creates a text node and gives it a text value
- } catch (SOAPException se) {
- se.printStackTrace();
- throw new RuntimeException("Something unexpected happened!");
- }
- throw new SOAPFaultException(theSOAPFault);
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java (from rev 4738, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2009-11-29 16:18:32 UTC (rev 11167)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1815;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.xml.namespace.QName;
+import javax.xml.soap.Detail;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Provider;
+import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * Test impl for http://jira.jboss.org/jira/browse/JBWS-1815
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 11-Oct-2007
+ */
+@Local
+@Stateless
+@WebServiceProvider(serviceName = "MyTestService",
+ portName = "MyTestPort",
+ targetNamespace = "http://www.my-company.it/ws/my-test",
+ wsdlLocation = "META-INF/wsdl/my-service.wsdl")
+@WebContext(contextRoot = "/jaxws-jbws1815")
+@ServiceMode(value = Service.Mode.MESSAGE)
+public class ProviderImpl implements Provider<SOAPMessage>
+{
+
+ public SOAPMessage invoke(SOAPMessage requestSoapMessage)
+ {
+ SOAPFault theSOAPFault;
+ try {
+ theSOAPFault = SOAPFactory.newInstance().createFault();
+ Detail soapFaultDetail = theSOAPFault.addDetail();
+ SOAPElement myFaultElement = soapFaultDetail.addChildElement(new QName("http://www.my-company.it/ws/my-test", "MyWSException"));
+ SOAPElement myMessageElement = myFaultElement.addChildElement(new QName("http://www.my-company.it/ws/my-test", "message"));
+// myMessageElement.setNodeValue("This is a faked error"); //wrong: myMessageElement is not a text node
+ myMessageElement.setValue("This is a faked error"); //right: this creates a text node and gives it a text value
+ } catch (SOAPException se) {
+ se.printStackTrace();
+ throw new RuntimeException("Something unexpected happened!");
+ }
+ throw new SOAPFaultException(theSOAPFault);
+ }
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815 (from rev 4738, stack/native/trunk/src/test/resources/jaxws/jbws1815)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF (from rev 4738, stack/native/trunk/src/test/resources/jaxws/jbws1815/META-INF)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl (from rev 4738, stack/native/trunk/src/test/resources/jaxws/jbws1815/META-INF/wsdl)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl 2007-10-11 12:15:07 UTC (rev 4738)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl 2009-11-29 16:18:32 UTC (rev 11167)
@@ -1,58 +0,0 @@
-<definitions name="MyTestService" targetNamespace="http://www.my-company.it/ws/my-test" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.my-company.it/ws/my-test" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <types>
- <schema elementFormDefault="qualified" targetNamespace="http://www.my-company.it/ws/my-test" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.my-company.it/ws/my-test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <complexType name="MyWSException">
- <sequence>
- <element name="message" nillable="true" type="string"/>
- </sequence>
- </complexType>
- <complexType name="performTest">
- <sequence>
- <element name="Code" nillable="true" type="long"/>
- </sequence>
- </complexType>
- <complexType name="performTestResponse">
- <sequence/>
- </complexType>
- <element name="MyWSException" type="tns:MyWSException"/>
- <element name="performTest" type="tns:performTest"/>
- <element name="performTestResponse" type="tns:performTestResponse"/>
- </schema>
- </types>
- <message name="MyTest_performTestResponse">
- <part element="tns:performTestResponse" name="result"/>
- </message>
- <message name="MyTest_performTest">
- <part element="tns:performTest" name="parameters"/>
- </message>
- <message name="MyWSException">
- <part element="tns:MyWSException" name="MyWSException"/>
- </message>
- <portType name="MyTest">
- <operation name="performTest">
- <input message="tns:MyTest_performTest"/>
- <output message="tns:MyTest_performTestResponse"/>
- <fault message="tns:MyWSException" name="MyWSException"/>
- </operation>
- </portType>
- <binding name="MyTestBinding" type="tns:MyTest">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="performTest">
- <soap:operation soapAction="urn:performTest"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="MyWSException">
- <soap:fault name="MyWSException" use="literal"/>
- </fault>
- </operation>
- </binding>
- <service name="MyTestService">
- <port binding="tns:MyTestBinding" name="MyTestPort">
- <soap:address location="http://my-company.it/my-context/my-endpoint"/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl (from rev 4738, stack/native/trunk/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl 2009-11-29 16:18:32 UTC (rev 11167)
@@ -0,0 +1,58 @@
+<definitions name="MyTestService" targetNamespace="http://www.my-company.it/ws/my-test" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.my-company.it/ws/my-test" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <schema elementFormDefault="qualified" targetNamespace="http://www.my-company.it/ws/my-test" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.my-company.it/ws/my-test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <complexType name="MyWSException">
+ <sequence>
+ <element name="message" nillable="true" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="performTest">
+ <sequence>
+ <element name="Code" nillable="true" type="long"/>
+ </sequence>
+ </complexType>
+ <complexType name="performTestResponse">
+ <sequence/>
+ </complexType>
+ <element name="MyWSException" type="tns:MyWSException"/>
+ <element name="performTest" type="tns:performTest"/>
+ <element name="performTestResponse" type="tns:performTestResponse"/>
+ </schema>
+ </types>
+ <message name="MyTest_performTestResponse">
+ <part element="tns:performTestResponse" name="result"/>
+ </message>
+ <message name="MyTest_performTest">
+ <part element="tns:performTest" name="parameters"/>
+ </message>
+ <message name="MyWSException">
+ <part element="tns:MyWSException" name="MyWSException"/>
+ </message>
+ <portType name="MyTest">
+ <operation name="performTest">
+ <input message="tns:MyTest_performTest"/>
+ <output message="tns:MyTest_performTestResponse"/>
+ <fault message="tns:MyWSException" name="MyWSException"/>
+ </operation>
+ </portType>
+ <binding name="MyTestBinding" type="tns:MyTest">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="performTest">
+ <soap:operation soapAction="urn:performTest"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="MyWSException">
+ <soap:fault name="MyWSException" use="literal"/>
+ </fault>
+ </operation>
+ </binding>
+ <service name="MyTestService">
+ <port binding="tns:MyTestBinding" name="MyTestPort">
+ <soap:address location="http://my-company.it/my-context/my-endpoint"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
14 years, 5 months
JBossWS SVN: r11166 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-11-27 17:26:16 -0500 (Fri, 27 Nov 2009)
New Revision: 11166
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
Log:
Make sure the dependency tree is in the build log, as we want to track what is bringing each dependency in
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-11-27 22:20:21 UTC (rev 11165)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2009-11-27 22:26:16 UTC (rev 11166)
@@ -142,6 +142,9 @@
<delete dir="${stack.output.dir}/jbossws-cxf-tp-installer"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
+ <arg line="${maven.opts} -Ptp-installer dependency:tree"/>
+ </exec>
+ <exec dir="${basedir}" executable="${mvn}" failonerror="true">
<arg line="${maven.opts} -Ptp-installer package assembly:directory"/>
</exec>
14 years, 5 months
JBossWS SVN: r11165 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-11-27 17:20:21 -0500 (Fri, 27 Nov 2009)
New Revision: 11165
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Add our own repo for maven plugins -- the maven own doesn't seem to have the compiler plugin 2.0.2.SP2 that we are looking for
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-11-27 18:05:01 UTC (rev 11164)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-11-27 22:20:21 UTC (rev 11165)
@@ -568,6 +568,18 @@
</snapshots>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
<!-- Profiles -->
<profiles>
14 years, 5 months