JBossWS SVN: r4358 - stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-14 06:29:44 -0400 (Tue, 14 Aug 2007)
New Revision: 4358
Modified:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java
Log:
[JBWS-1762] enabling the test
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-14 10:18:48 UTC (rev 4357)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1762/JBWS1762TestCase1.java 2007-08-14 10:29:44 UTC (rev 4358)
@@ -57,20 +57,12 @@
QName serviceName = new QName(targetNS, "JBWS1762Service");
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1762/JBWS1762Service?wsdl");
- if (true) {
- System.out.println("FIXME: [JBWS-1762] Fix this issue");
- return;
- }
Service service = Service.create(wsdlURL, serviceName);
proxy = (JBWS1762)service.getPort(JBWS1762.class);
}
public void testIssue() throws Exception
{
- if (true) {
- System.out.println("FIXME: [JBWS-1762] Fix this issue");
- return;
- }
assertEquals(proxy.echo("Hello!"), "Hello!");
}
17 years, 4 months
JBossWS SVN: r4357 - stack/native/trunk/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 06:18:48 -0400 (Tue, 14 Aug 2007)
New Revision: 4357
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
[JBWS-1670] SunRI client does not throw UserException. Do not unwrap InvocationTargetException
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:09:19 UTC (rev 4356)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:18:48 UTC (rev 4357)
@@ -23,9 +23,33 @@
// $Id$
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.HashMap;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.http.HTTPBinding;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.*;
+import org.jboss.ws.core.CommonBinding;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPBinding;
+import org.jboss.ws.core.CommonSOAPFaultException;
+import org.jboss.ws.core.DirectionHolder;
+import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.DirectionHolder.Direction;
import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC;
@@ -45,25 +69,15 @@
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.http.HTTPBinding;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
/** An implementation handles invocations on the endpoint
*
* @author Thomas.Diesler(a)jboss.org
@@ -192,8 +206,18 @@
// Invoke an instance of the SEI implementation bean
Invocation inv = setupInvocation(endpoint, sepInv, invContext);
InvocationHandler invHandler = endpoint.getInvocationHandler();
- invHandler.invoke(endpoint, inv);
+ try
+ {
+ invHandler.invoke(endpoint, inv);
+ }
+ catch (InvocationTargetException th)
+ {
+ // Unwrap the throwable raised by the service endpoint implementation
+ Throwable targetEx = ((InvocationTargetException)th).getTargetException();
+ throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx));
+ }
+
// Handler processing might have replaced the endpoint invocation
sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class);
}
@@ -279,16 +303,14 @@
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
- InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext
- );
+ wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext);
}
else
{
// TODO: This is an ESB case, they require a custom MessageContext
// that works independed of MessageContext.SERVLET_REQUEST
- throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+
- "You should provide a custom spi.invocation.InvocationHandlerFactory");
+ throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"
+ + "You should provide a custom spi.invocation.InvocationHandlerFactory");
}
invContext.addAttachment(WebServiceContext.class, wsContext);
}
17 years, 4 months
JBossWS SVN: r4356 - in stack/native/branches/native-2.0: src/main/java/org/jboss/ws/core/server and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 06:09:19 -0400 (Tue, 14 Aug 2007)
New Revision: 4356
Modified:
stack/native/branches/native-2.0/.classpath
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
Log:
[JBWS-1670] SunRI client does not throw UserException. Do not unwrap InvocationTargetException
Modified: stack/native/branches/native-2.0/.classpath
===================================================================
--- stack/native/branches/native-2.0/.classpath 2007-08-14 10:04:06 UTC (rev 4355)
+++ stack/native/branches/native-2.0/.classpath 2007-08-14 10:09:19 UTC (rev 4356)
@@ -10,7 +10,6 @@
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
@@ -37,7 +36,8 @@
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:04:06 UTC (rev 4355)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:09:19 UTC (rev 4356)
@@ -23,7 +23,9 @@
// $Id$
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
import java.util.HashMap;
import javax.activation.DataHandler;
@@ -212,7 +214,17 @@
// Invoke an instance of the SEI implementation bean
Invocation inv = setupInvocation(endpoint, sepInv, invContext);
InvocationHandler invHandler = endpoint.getInvocationHandler();
- invHandler.invoke(endpoint, inv);
+
+ try
+ {
+ invHandler.invoke(endpoint, inv);
+ }
+ catch (InvocationTargetException th)
+ {
+ // Unwrap the throwable raised by the service endpoint implementation
+ Throwable targetEx = ((InvocationTargetException)th).getTargetException();
+ throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx));
+ }
// Handler processing might have replaced the endpoint invocation
sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class);
17 years, 4 months
JBossWS SVN: r4355 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 06:04:06 -0400 (Tue, 14 Aug 2007)
New Revision: 4355
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
Log:
[JBWS-1670] SunRI client does not throw UserException. Do not unwrap InvocationTargetException
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-08-14 09:46:11 UTC (rev 4354)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-08-14 10:04:06 UTC (rev 4355)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.invocation;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.UndeclaredThrowableException;
import javax.management.MBeanException;
@@ -53,13 +52,6 @@
throw ((MBeanException)th).getTargetException();
}
- if (th instanceof InvocationTargetException)
- {
- // Unwrap the throwable raised by the service endpoint implementation
- Throwable targetEx = ((InvocationTargetException)th).getTargetException();
- handleInvocationException(targetEx);
- }
-
if (th instanceof Exception)
{
throw (Exception)th;
17 years, 4 months
JBossWS SVN: r4354 - container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-14 05:46:11 -0400 (Tue, 14 Aug 2007)
New Revision: 4354
Modified:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
Log:
[JBWS-1762] fix of the issue for jboss42 integration layer
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-08-14 09:45:44 UTC (rev 4353)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-08-14 09:46:11 UTC (rev 4354)
@@ -23,6 +23,12 @@
//$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import javax.xml.ws.WebServiceException;
+
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -61,4 +67,36 @@
}
}
}
+
+ public void destroy(Deployment dep)
+ {
+ URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WebServiceException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WebServiceException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // On destroy remove the modified web.xml and rollback web.xml.org to web.xml
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ webXML.delete();
+
+ // Rename the web.xml.org
+ if (orgWebXML.renameTo(webXML) == false)
+ throw new WebServiceException("Cannot rename web.xml: " + orgWebXML);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
}
\ No newline at end of file
17 years, 4 months
JBossWS SVN: r4353 - container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-14 05:45:44 -0400 (Tue, 14 Aug 2007)
New Revision: 4353
Modified:
container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/ModifyWebMetaDataDeploymentAspect.java
Log:
[JBWS-1762] fix of the issue for jboss40 integration layer
Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/ModifyWebMetaDataDeploymentAspect.java 2007-08-14 08:50:50 UTC (rev 4352)
+++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/ModifyWebMetaDataDeploymentAspect.java 2007-08-14 09:45:44 UTC (rev 4353)
@@ -23,6 +23,12 @@
//$Id: ModifyWebMetaDataDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import javax.xml.ws.WebServiceException;
+
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -61,4 +67,36 @@
}
}
}
+
+ public void destroy(Deployment dep)
+ {
+ URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WebServiceException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WebServiceException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // On destroy remove the modified web.xml and rollback web.xml.org to web.xml
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ webXML.delete();
+
+ // Rename the web.xml.org
+ if (orgWebXML.renameTo(webXML) == false)
+ throw new WebServiceException("Cannot rename web.xml: " + orgWebXML);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
}
\ No newline at end of file
17 years, 4 months
JBossWS SVN: r4352 - stack/native/branches/native-2.0/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 04:50:50 -0400 (Tue, 14 Aug 2007)
New Revision: 4352
Modified:
stack/native/branches/native-2.0/ant-import/build-release.xml
Log:
check framework svn:externals definition
Modified: stack/native/branches/native-2.0/ant-import/build-release.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/build-release.xml 2007-08-14 08:22:22 UTC (rev 4351)
+++ stack/native/branches/native-2.0/ant-import/build-release.xml 2007-08-14 08:50:50 UTC (rev 4352)
@@ -14,7 +14,7 @@
<project>
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jars"
+ <target name="release" depends="jars,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
<!-- jboss/jbossws -->
@@ -81,4 +81,26 @@
</copy>
</target>
+ <target name="check-svn-externals" depends="init">
+ <exec dir="${core.dir}/src/test-framework" executable="svn" failonerror="true" output="${core.dir}/output/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${core.dir}/output/svn-info.xml"/>
+ <condition property="framework.externals.ok">
+ <or>
+ <contains string="${info.entry.url}" substring="https://svn.jboss.org/repos/jbossws/framework/tags"/>
+ <equals arg1="${repository.id}" arg2="snapshot"/>
+ </or>
+ </condition>
+ </target>
+ <target name="warn-svn-externals" depends="init" unless="framework.externals.ok">
+ <echo>
+ ***********************************************
+ * External link to framework is not tagged! *
+ * Run: svn pe svn:externals src *
+ ***********************************************
+ </echo>
+ </target>
+
</project>
17 years, 4 months
JBossWS SVN: r4351 - in container: jboss42/trunk and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 04:22:22 -0400 (Tue, 14 Aug 2007)
New Revision: 4351
Modified:
container/jboss40/trunk/version.properties
container/jboss42/trunk/version.properties
container/jboss50/trunk/version.properties
Log:
Use framework-2.0.1.CR1
Modified: container/jboss40/trunk/version.properties
===================================================================
--- container/jboss40/trunk/version.properties 2007-08-14 08:18:10 UTC (rev 4350)
+++ container/jboss40/trunk/version.properties 2007-08-14 08:22:22 UTC (rev 4351)
@@ -15,8 +15,8 @@
# Thirdparty library versions
jbossws-common=1.0.0.CR1
-jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
+jbossws-framework=2.0.1.CR1
dom4j=1.6.1
sun-jaxrpc=1.1
Modified: container/jboss42/trunk/version.properties
===================================================================
--- container/jboss42/trunk/version.properties 2007-08-14 08:18:10 UTC (rev 4350)
+++ container/jboss42/trunk/version.properties 2007-08-14 08:22:22 UTC (rev 4351)
@@ -15,8 +15,8 @@
# Thirdparty library versions
jbossws-common=1.0.0.CR1
-jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
+jbossws-framework=2.0.1.CR1
dom4j=1.6.1
sun-jaxrpc=1.1
Modified: container/jboss50/trunk/version.properties
===================================================================
--- container/jboss50/trunk/version.properties 2007-08-14 08:18:10 UTC (rev 4350)
+++ container/jboss50/trunk/version.properties 2007-08-14 08:22:22 UTC (rev 4351)
@@ -15,8 +15,8 @@
# Thirdparty library versions
jbossws-common=1.0.0.CR1
-jbossws-framework=1.0.0.CR1
jbossws-spi=1.0.0.CR1
+jbossws-framework=2.0.1.CR1
dom4j=1.6.1
sun-jaxrpc=1.1
17 years, 4 months
JBossWS SVN: r4350 - in container: jboss42/trunk/src/main/etc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 04:18:10 -0400 (Tue, 14 Aug 2007)
New Revision: 4350
Modified:
container/jboss40/trunk/src/main/etc/component-info.xml
container/jboss42/trunk/src/main/etc/component-info.xml
container/jboss50/trunk/src/main/etc/component-info.xml
Log:
Restore explicit dependency on jbossws-framework
Modified: container/jboss40/trunk/src/main/etc/component-info.xml
===================================================================
--- container/jboss40/trunk/src/main/etc/component-info.xml 2007-08-14 08:04:12 UTC (rev 4349)
+++ container/jboss40/trunk/src/main/etc/component-info.xml 2007-08-14 08:18:10 UTC (rev 4350)
@@ -11,6 +11,9 @@
<import componentref="jboss/jbossws-common">
<compatible version="@jbossws-common@"/>
</import>
+ <import componentref="jboss/jbossws-framework">
+ <compatible version="@jbossws-framework@"/>
+ </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@jbossws-spi@"/>
</import>
Modified: container/jboss42/trunk/src/main/etc/component-info.xml
===================================================================
--- container/jboss42/trunk/src/main/etc/component-info.xml 2007-08-14 08:04:12 UTC (rev 4349)
+++ container/jboss42/trunk/src/main/etc/component-info.xml 2007-08-14 08:18:10 UTC (rev 4350)
@@ -11,6 +11,9 @@
<import componentref="jboss/jbossws-common">
<compatible version="@jbossws-common@"/>
</import>
+ <import componentref="jboss/jbossws-framework">
+ <compatible version="@jbossws-framework@"/>
+ </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@jbossws-spi@"/>
</import>
Modified: container/jboss50/trunk/src/main/etc/component-info.xml
===================================================================
--- container/jboss50/trunk/src/main/etc/component-info.xml 2007-08-14 08:04:12 UTC (rev 4349)
+++ container/jboss50/trunk/src/main/etc/component-info.xml 2007-08-14 08:18:10 UTC (rev 4350)
@@ -12,6 +12,9 @@
<import componentref="jboss/jbossws-common">
<compatible version="@jbossws-common@"/>
</import>
+ <import componentref="jboss/jbossws-framework">
+ <compatible version="@jbossws-framework@"/>
+ </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@jbossws-spi@"/>
</import>
17 years, 4 months
JBossWS SVN: r4349 - in stack/native/branches/native-2.0: src/test/java/org/jboss/test/ws/jaxrpc/marshall and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-14 04:04:12 -0400 (Tue, 14 Aug 2007)
New Revision: 4349
Modified:
stack/native/branches/native-2.0/ant-import/build-thirdparty.xml
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
Log:
[JBWS-1617] JAXRPC doc/literal trims empty string. Postpone to jbossws-2.0.2
Modified: stack/native/branches/native-2.0/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/build-thirdparty.xml 2007-08-13 17:21:21 UTC (rev 4348)
+++ stack/native/branches/native-2.0/ant-import/build-thirdparty.xml 2007-08-14 08:04:12 UTC (rev 4349)
@@ -129,9 +129,9 @@
<!--
[JBWS-1617] JAXRPC doc/literal trims empty string
- -->
<get src="http://snapshots.jboss.org/maven2/org/jboss/jbossxb/1.0.0-SNAPSHOT/jbossx..." dest="${thirdparty.dir}/jbossxb-1.0.0-snapshot.jar" usetimestamp="true" verbose="true"/>
<copy tofile="${thirdparty.dir}/jboss-xml-binding.jar" file="${thirdparty.dir}/jbossxb-1.0.0-snapshot.jar"/>
+ -->
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-13 17:21:21 UTC (rev 4348)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-14 08:04:12 UTC (rev 4349)
@@ -608,15 +608,11 @@
String out = stringTest(in);
assertEquals(in, out);
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string");
- return;
- }
+ System.out.println("FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string");
- in = " ";
- out = stringTest(in);
- assertEquals(in, out);
+// in = " ";
+// out = stringTest(in);
+// assertEquals(in, out);
}
public void testStringSpecialChars() throws Exception
17 years, 4 months