JBossWS SVN: r11105 - in stack/cxf/trunk: modules/client and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-10 13:24:18 -0500 (Tue, 10 Nov 2009)
New Revision: 11105
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-2825] modifing poms
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-11-10 12:40:48 UTC (rev 11104)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-11-10 18:24:18 UTC (rev 11105)
@@ -28,10 +28,6 @@
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-anttasks</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-11-10 12:40:48 UTC (rev 11104)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-11-10 18:24:18 UTC (rev 11105)
@@ -38,10 +38,6 @@
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-anttasks</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-11-10 12:40:48 UTC (rev 11104)
+++ stack/cxf/trunk/pom.xml 2009-11-10 18:24:18 UTC (rev 11105)
@@ -192,11 +192,6 @@
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-anttasks</artifactId>
- <version>${cxf.anttasks.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf.version}</version>
</dependency>
15 years, 1 month
JBossWS SVN: r11104 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2009-11-10 07:40:48 -0500 (Tue, 10 Nov 2009)
New Revision: 11104
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-2817]:add sleep time to wait CopyJob copy the process inputstream;this will fix the test failure occurs sometimes
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-10 11:54:00 UTC (rev 11103)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-10 12:40:48 UTC (rev 11104)
@@ -93,6 +93,8 @@
String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + FS + "endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
executeCommand(command, bout);
+ //wait the CopyJob to copy the process.inputStream
+ Thread.sleep(3000);
String res = null;
if (bout.toByteArray() != null) {
String output = new String(bout.toByteArray());
15 years, 1 month
JBossWS SVN: r11103 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2009-11-10 06:54:00 -0500 (Tue, 10 Nov 2009)
New Revision: 11103
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-2817]:Use executeCommand() to avoid hangs error on windows
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-10 09:42:59 UTC (rev 11102)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-11-10 11:54:00 UTC (rev 11103)
@@ -24,13 +24,11 @@
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.InputStreamReader;
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.wsf.common.IOUtils;
/**
* [JBWS-1666] Simplify JBossWS jar dependencies
@@ -92,24 +90,15 @@
cp.append(PS + jbc + FS + "jboss-common-core.jar");
cp.append(PS + jbc + FS + "jboss-javaee.jar");
- Runtime rt = Runtime.getRuntime();
-
String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + FS + "endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
- System.out.println("Executing command: " + command);
- Process proc = rt.exec(command);
- int status = proc.waitFor();
- if (status == 0)
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
- String resStr = br.readLine();
- assertEquals(TestClient.REQ_STR, resStr);
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ executeCommand(command, bout);
+ String res = null;
+ if (bout.toByteArray() != null) {
+ String output = new String(bout.toByteArray());
+ BufferedReader reader = new BufferedReader(new java.io.StringReader(output));
+ res = reader.readLine();
}
- else
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, proc.getErrorStream());
- String errStr = new String(baos.toByteArray());
- fail(errStr);
- }
+ assertEquals(TestClient.REQ_STR, res);
}
}
15 years, 1 month
JBossWS SVN: r11102 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2009-11-10 04:42:59 -0500 (Tue, 10 Nov 2009)
New Revision: 11102
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
Log:
TO fix the build:there is one test failure when remove the verbos flag in CXFProviderImpl
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2009-11-10 05:51:49 UTC (rev 11101)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2009-11-10 09:42:59 UTC (rev 11102)
@@ -149,8 +149,8 @@
PrintStream stream = messageStream;
if (stream != null)
{
- // There is no need to set verbose to cxf java2ws tool
- //args.add("-verbose");
+ //TODO: There is no need to set verbose to cxf java2ws tool ?
+ args.add("-verbose");
}
else
{
15 years, 1 month
JBossWS SVN: r11101 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2009-11-10 00:51:49 -0500 (Tue, 10 Nov 2009)
New Revision: 11101
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
Log:
Fixed the JMSTransportTestCase hangs issue
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2009-11-10 02:17:41 UTC (rev 11100)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2009-11-10 05:51:49 UTC (rev 11101)
@@ -8,14 +8,15 @@
<servlet>
<servlet-name>OrganizationService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationHttpEndpoint</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>OrganizationJmsService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationJmsEndpoint</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
-
-
+
<servlet-mapping>
<servlet-name>OrganizationService</servlet-name>
<url-pattern>/*</url-pattern>
15 years, 1 month
JBossWS SVN: r11100 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2009-11-09 21:17:41 -0500 (Mon, 09 Nov 2009)
New Revision: 11100
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
Log:
[Minor fix]:decreae the wait time to see if it can fix the hudson hangs problem
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2009-11-09 10:39:11 UTC (rev 11099)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2009-11-10 02:17:41 UTC (rev 11100)
@@ -94,11 +94,11 @@
sender.send(message);
sender.close();
- int timeout = 3000;
+ int timeout = 5;
while (waitForResponse && timeout > 0)
{
- Thread.sleep(100);
- timeout -= 10;
+ Thread.sleep(1000);
+ timeout = timeout -1;
}
assertNotNull("Expected response message", responseListener.resMessage);
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-11-09 10:39:11 UTC (rev 11099)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-11-10 02:17:41 UTC (rev 11100)
@@ -126,11 +126,11 @@
sender.send(message);
sender.close();
- int timeout = 3000;
+ int timeout = 5;
while (waitForResponse && timeout > 0)
{
- Thread.sleep(100);
- timeout -= 10;
+ Thread.sleep(1000);
+ timeout = timeout -1;
}
assertNotNull("Expected response message", responseListener.resMessage);
15 years, 1 month
JBossWS SVN: r11099 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-11-09 05:39:11 -0500 (Mon, 09 Nov 2009)
New Revision: 11099
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
Log:
[JBWS-2746] Make SOAPFactoryImpl directly use its own createElement(..) method instead of looking for the current configured SOAPFactory
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2009-11-09 10:24:19 UTC (rev 11098)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2009-11-09 10:39:11 UTC (rev 11099)
@@ -134,7 +134,7 @@
{
// Construct the envelope
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
- SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false), false);
+ SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, (SOAPElementImpl)soapFactory.createElement(domEnv, false), false);
DOMUtils.copyAttributes(soapEnv, domEnv);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2009-11-09 10:24:19 UTC (rev 11098)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2009-11-09 10:39:11 UTC (rev 11099)
@@ -21,11 +21,8 @@
*/
package org.jboss.ws.core.soap;
-import java.util.Iterator;
-
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
-import javax.xml.soap.Node;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
@@ -52,9 +49,9 @@
/** Construct a SOAP envelope for the given SOAP version URI prefix, etc.
*/
- public SOAPEnvelopeImpl(SOAPPartImpl soapPart, SOAPElement element, boolean addHeaderAndBody) throws SOAPException
+ public SOAPEnvelopeImpl(SOAPPartImpl soapPart, SOAPElementImpl element, boolean addHeaderAndBody) throws SOAPException
{
- super((SOAPElementImpl)element);
+ super(element);
this.soapPart = soapPart;
soapPart.setEnvelope(this);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2009-11-09 10:24:19 UTC (rev 11098)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2009-11-09 10:39:11 UTC (rev 11099)
@@ -118,8 +118,7 @@
String prefix = domElement.getPrefix() != null ? domElement.getPrefix() : "";
String nsURI = domElement.getNamespaceURI() != null ? domElement.getNamespaceURI() : "";
- SOAPFactory factory = SOAPFactory.newInstance();
- SOAPElement soapElement = factory.createElement(localName, prefix, nsURI);
+ SOAPElement soapElement = this.createElement(localName, prefix, nsURI);
DOMUtils.copyAttributes(soapElement, domElement);
15 years, 1 month