JBossWS SVN: r7021 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: common/soap/attachment and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 13:00:59 -0400 (Tue, 13 May 2008)
New Revision: 7021
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java
Log:
[JBWS-2176] Removing MessageContext association once the test is over
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2008-05-13 14:22:33 UTC (rev 7020)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2008-05-13 17:00:59 UTC (rev 7021)
@@ -49,8 +49,8 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.common.DOMUtils;
/**
* Test the SOAPBindingProvider
@@ -168,6 +168,11 @@
MessageContextAssociation.pushMessageContext(messageContext);
messageContext.setOperationMetaData(opMetaData);
}
+
+ protected void tearDown()
+ {
+ MessageContextAssociation.popMessageContext();
+ }
/** Test binding of the request message
*/
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2008-05-13 14:22:33 UTC (rev 7020)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2008-05-13 17:00:59 UTC (rev 7021)
@@ -142,55 +142,62 @@
OperationMetaData opMetaData = call.getOperationMetaData();
- // Associate a message context with the current thread
- SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC();
- MessageContextAssociation.pushMessageContext(messageContext);
- messageContext.setOperationMetaData(opMetaData);
-
- CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING, Type.JAXRPC);
- CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding();
-
- EndpointInvocation epInv = new EndpointInvocation(opMetaData);
- epInv.initInputParams(new Object[]{"Hello World!", "hi"});
-
- SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, null);
-
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
- reqMessage.saveChanges();
- reqMessage.writeTo(stream);
-
- ByteArrayInputStream in = new ByteArrayInputStream(stream.toByteArray());
-
- String type = reqMessage.getMimeHeaders().getHeader(MimeConstants.CONTENT_TYPE)[0];
-
- MimeHeaders headers = new MimeHeaders();
- headers.addHeader(MimeConstants.CONTENT_TYPE, type);
- SOAPMessageImpl msg2 = (SOAPMessageImpl)new MessageFactoryImpl().createMessage(headers, in);
-
- epInv = binding.unbindRequestMessage(opMetaData, msg2);
-
- assertEquals(epInv.getRequestParamValue(new QName("String_1")).toString(), "Hello World!");
- assertEquals(epInv.getRequestParamValue(new QName("foo")).toString(), "hi");
-
- epInv.setReturnValue("test");
-
- SOAPMessage responseMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv);
-
- stream = new ByteArrayOutputStream();
- responseMessage.writeTo(stream);
-
- in = new ByteArrayInputStream(stream.toByteArray());
-
- type = responseMessage.getMimeHeaders().getHeader(MimeConstants.CONTENT_TYPE)[0];
-
- headers = new MimeHeaders();
- headers.addHeader(MimeConstants.CONTENT_TYPE, type);
- SOAPMessageImpl msg3 = (SOAPMessageImpl)new MessageFactoryImpl().createMessage(headers, in);
-
- binding.unbindResponseMessage(opMetaData, msg3, epInv, null);
-
- assertEquals("test", epInv.getReturnValue());
+ try
+ {
+ // Associate a message context with the current thread
+ SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC();
+ MessageContextAssociation.pushMessageContext(messageContext);
+ messageContext.setOperationMetaData(opMetaData);
+
+ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING, Type.JAXRPC);
+ CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding();
+
+ EndpointInvocation epInv = new EndpointInvocation(opMetaData);
+ epInv.initInputParams(new Object[]{"Hello World!", "hi"});
+
+ SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, null);
+
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+
+ reqMessage.saveChanges();
+ reqMessage.writeTo(stream);
+
+ ByteArrayInputStream in = new ByteArrayInputStream(stream.toByteArray());
+
+ String type = reqMessage.getMimeHeaders().getHeader(MimeConstants.CONTENT_TYPE)[0];
+
+ MimeHeaders headers = new MimeHeaders();
+ headers.addHeader(MimeConstants.CONTENT_TYPE, type);
+ SOAPMessageImpl msg2 = (SOAPMessageImpl)new MessageFactoryImpl().createMessage(headers, in);
+
+ epInv = binding.unbindRequestMessage(opMetaData, msg2);
+
+ assertEquals(epInv.getRequestParamValue(new QName("String_1")).toString(), "Hello World!");
+ assertEquals(epInv.getRequestParamValue(new QName("foo")).toString(), "hi");
+
+ epInv.setReturnValue("test");
+
+ SOAPMessage responseMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv);
+
+ stream = new ByteArrayOutputStream();
+ responseMessage.writeTo(stream);
+
+ in = new ByteArrayInputStream(stream.toByteArray());
+
+ type = responseMessage.getMimeHeaders().getHeader(MimeConstants.CONTENT_TYPE)[0];
+
+ headers = new MimeHeaders();
+ headers.addHeader(MimeConstants.CONTENT_TYPE, type);
+ SOAPMessageImpl msg3 = (SOAPMessageImpl)new MessageFactoryImpl().createMessage(headers, in);
+
+ binding.unbindResponseMessage(opMetaData, msg3, epInv, null);
+
+ assertEquals("test", epInv.getReturnValue());
+ }
+ finally
+ {
+ MessageContextAssociation.popMessageContext();
+ }
}
public void testMimeMatchingAttachments() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2008-05-13 14:22:33 UTC (rev 7020)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2008-05-13 17:00:59 UTC (rev 7021)
@@ -112,7 +112,14 @@
public void testXOPContext()
{
SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC();
- MessageContextAssociation.pushMessageContext(messageContext);
- assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled());
+ try
+ {
+ MessageContextAssociation.pushMessageContext(messageContext);
+ assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled());
+ }
+ finally
+ {
+ MessageContextAssociation.popMessageContext();
+ }
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2008-05-13 14:22:33 UTC (rev 7020)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2008-05-13 17:00:59 UTC (rev 7021)
@@ -104,8 +104,15 @@
public void testXOPContext()
{
SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS();
- MessageContextAssociation.pushMessageContext(msgContext);
- assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled());
+ try
+ {
+ MessageContextAssociation.pushMessageContext(msgContext);
+ assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled());
+ }
+ finally
+ {
+ MessageContextAssociation.popMessageContext();
+ }
}
public void testNestedArray() throws Exception
16 years, 8 months
JBossWS SVN: r7020 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 10:22:33 -0400 (Tue, 13 May 2008)
New Revision: 7020
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
Fixing smoke tools regression
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-05-13 14:22:11 UTC (rev 7019)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-05-13 14:22:33 UTC (rev 7020)
@@ -45,8 +45,9 @@
private String ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
private String JBOSS_HOME;
- private String JDK_HOME;
- private String TEST_EXEC_DIR;
+ private String JAVA_HOME;
+ private String CLASSES_DIR;
+ private String TEST_DIR;
private String OS;
protected void setUp() throws Exception
@@ -54,8 +55,9 @@
super.setUp();
JBOSS_HOME = System.getProperty("jboss.home");
- TEST_EXEC_DIR = new File(".").getCanonicalPath();
- JDK_HOME = System.getProperty("jdk.home");
+ CLASSES_DIR = System.getProperty("test.classes.directory");
+ TEST_DIR = createResourceFile("..").getAbsolutePath();
+ JAVA_HOME = System.getProperty("java.home");
OS = System.getProperty("os.name").toLowerCase();
}
@@ -68,7 +70,7 @@
// use absolute path for the output to be re-usable
String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
- String absOutput = new File("wsconsume/java").getAbsolutePath();
+ String absOutput = new File(TEST_DIR, "wsconsume/java").getAbsolutePath();
String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o " + absOutput + " " + absWsdlLoc;
Process p = executeCommand(command);
@@ -76,7 +78,7 @@
// check status code
assertStatusCode(p, "wsconsume");
- File javaSource = new File("wsconsume/java/org/openuri/_2004/_04/helloworld/EndpointInterface.java");
+ File javaSource = new File(TEST_DIR, "wsconsume/java/org/openuri/_2004/_04/helloworld/EndpointInterface.java");
assertTrue("Service endpoint interface not generated", javaSource.exists());
}
@@ -88,16 +90,15 @@
fail("This test has not been verified on windows");
}
- String absOutput = new File("wsprovide/java/").getAbsolutePath();
+ String absOutput = new File(TEST_DIR, "wsprovide/java/").getAbsolutePath();
- String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o " + absOutput + " --classpath " + TEST_EXEC_DIR + "/test-classes " + ENDPOINT_CLASS;
+ String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
Process p = executeCommand(command);
// check status code
assertStatusCode(p, "wsprovide");
- File outputDir = new File("wsprovide/java");
- File javaSource = new File(outputDir.getAbsolutePath() + "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java");
+ File javaSource = new File(TEST_DIR, "wsprovide/java/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java");
assertTrue("Response wrapper not generated", javaSource.exists());
}
@@ -106,9 +107,8 @@
{
// be verbose
System.out.println("cmd: " + command);
- System.out.println("test execution dir: " + TEST_EXEC_DIR);
- Process p = Runtime.getRuntime().exec(command, new String[] { "JBOSS_HOME=" + JBOSS_HOME, "JAVA_HOME=" + JDK_HOME });
+ Process p = Runtime.getRuntime().exec(command, new String[] { "JBOSS_HOME=" + JBOSS_HOME, "JAVA_HOME=" + JAVA_HOME });
return p;
}
16 years, 8 months
JBossWS SVN: r7019 - framework/trunk/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 10:22:11 -0400 (Tue, 13 May 2008)
New Revision: 7019
Modified:
framework/trunk/src/main/etc/wsconsume.bat
framework/trunk/src/main/etc/wsconsume.sh
framework/trunk/src/main/etc/wsprovide.bat
framework/trunk/src/main/etc/wsprovide.sh
Log:
More fixes to the tools script classpath
Modified: framework/trunk/src/main/etc/wsconsume.bat
===================================================================
--- framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 13:27:05 UTC (rev 7018)
+++ framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 14:22:11 UTC (rev 7019)
@@ -38,6 +38,8 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
rem shared jaxws libs
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
Modified: framework/trunk/src/main/etc/wsconsume.sh
===================================================================
--- framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 13:27:05 UTC (rev 7018)
+++ framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 14:22:11 UTC (rev 7019)
@@ -85,6 +85,8 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/log4j.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/mail.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-common.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-framework.jar"
# shared jaxws libs
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar"
Modified: framework/trunk/src/main/etc/wsprovide.bat
===================================================================
--- framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 13:27:05 UTC (rev 7018)
+++ framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 14:22:11 UTC (rev 7019)
@@ -32,6 +32,8 @@
rem shared libs
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
Modified: framework/trunk/src/main/etc/wsprovide.sh
===================================================================
--- framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 13:27:05 UTC (rev 7018)
+++ framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 14:22:11 UTC (rev 7019)
@@ -79,6 +79,8 @@
# shared libs
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-common.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-framework.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
@@ -113,7 +115,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-client.jar"
- WSPROVIDE_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws-ext.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar"
16 years, 8 months
JBossWS SVN: r7018 - framework/trunk/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 09:27:05 -0400 (Tue, 13 May 2008)
New Revision: 7018
Modified:
framework/trunk/src/main/etc/wsconsume.bat
framework/trunk/src/main/etc/wsconsume.sh
framework/trunk/src/main/etc/wsprovide.bat
framework/trunk/src/main/etc/wsprovide.sh
Log:
Adding jbossws-native-jaxws-ext.jar to the tools classpath
Modified: framework/trunk/src/main/etc/wsconsume.bat
===================================================================
--- framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 13:26:13 UTC (rev 7017)
+++ framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 13:27:05 UTC (rev 7018)
@@ -63,6 +63,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
:endif
Modified: framework/trunk/src/main/etc/wsconsume.sh
===================================================================
--- framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 13:26:13 UTC (rev 7017)
+++ framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 13:27:05 UTC (rev 7018)
@@ -112,6 +112,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-client.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxws-ext.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar"
fi
Modified: framework/trunk/src/main/etc/wsprovide.bat
===================================================================
--- framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 13:26:13 UTC (rev 7017)
+++ framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 13:27:05 UTC (rev 7018)
@@ -66,6 +66,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
Modified: framework/trunk/src/main/etc/wsprovide.sh
===================================================================
--- framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 13:26:13 UTC (rev 7017)
+++ framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 13:27:05 UTC (rev 7018)
@@ -115,6 +115,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-client.jar"
WSPROVIDE_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws-ext.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar"
16 years, 8 months
JBossWS SVN: r7017 - in stack/native/trunk/modules/testsuite/native-tests/src/test: resources/jaxws/jbws771 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 09:26:13 -0400 (Tue, 13 May 2008)
New Revision: 7017
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml
Log:
More on JBWS771TestCase, checking the sources are actually generated
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-05-13 10:53:45 UTC (rev 7016)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-05-13 13:26:13 UTC (rev 7017)
@@ -150,13 +150,15 @@
public void testWSConsume() throws Exception
{
// use absolute path for the output to be re-usable
- String absOutput = new File(RESOURCES_DIR + "/../wsconsume/java").getAbsolutePath();
- String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o " + absOutput + " --binding=" + RESOURCES_DIR + "/jaxws/jbws771/binding.xml " + wsdlURL.toExternalForm();
+ String absOutput = createResourceFile("wsconsume/java").getAbsolutePath();
+ String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o " + absOutput + " --extension --binding=" + RESOURCES_DIR + "/jaxws/jbws771/binding.xml " + wsdlURL.toExternalForm();
Process p = executeCommand(command);
// check status code
assertStatusCode(p, "wsconsume");
-
+
+ File javaSource = getResourceFile("wsconsume/java/org/jboss/test/ws/jaxws/jbws771/JBWS771Service.java");
+ assertTrue("Service endpoint interface not generated", javaSource.exists());
}
private Definition getWSDLDefinition(String wsdlLocation) throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2008-05-13 10:53:45 UTC (rev 7016)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2008-05-13 13:26:13 UTC (rev 7017)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<jaxws:bindings wsdlLocation="http://localhost:8080/jaxws-jbws771/IWebsvcImpl?wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<jaxws:bindings
@@ -10,4 +10,4 @@
part="wsdl:definitions/wsdl:message[@name='IWebsvc_cancel']/wsdl:part[@name='parameters']"
element="tns:cancel" name="cancelMessage"/>
</jaxws:bindings>
-</jaxws:bindings>
\ No newline at end of file
+</jaxws:bindings>
16 years, 8 months
JBossWS SVN: r7016 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 06:53:45 -0400 (Tue, 13 May 2008)
New Revision: 7016
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
Log:
Fixing JBWS771TestCase regression
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-05-13 10:38:03 UTC (rev 7015)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-05-13 10:53:45 UTC (rev 7016)
@@ -23,10 +23,10 @@
// $Id: JBWS771TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler(a)jboss.com $
+import java.io.File;
+import java.io.IOException;
import java.net.URL;
import java.util.List;
-import java.io.IOException;
-import java.io.File;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -44,7 +44,6 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.wsf.spi.tools.cmd.WSConsume;
/**
* [JBWS-771] Use part names that are friendly to .NET
@@ -60,7 +59,7 @@
private String JBOSS_HOME;
private String JDK_HOME;
- private String TEST_EXEC_DIR;
+ private String RESOURCES_DIR;
private String OS;
public static Test suite()
@@ -81,8 +80,8 @@
}
JBOSS_HOME = System.getProperty("jboss.home");
- TEST_EXEC_DIR = System.getProperty("test.execution.dir");
- JDK_HOME = System.getProperty("jdk.home");
+ RESOURCES_DIR = createResourceFile(".").getPath();
+ JDK_HOME = System.getProperty("java.home");
OS = System.getProperty("os.name").toLowerCase();
}
@@ -149,10 +148,10 @@
}
public void testWSConsume() throws Exception
- {
+ {
// use absolute path for the output to be re-usable
- String absOutput = new File("wsconsume/java").getAbsolutePath();
- String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o "+absOutput+" --binding=resources/jaxws/jbws771/binding.xml "+ wsdlURL.toExternalForm();
+ String absOutput = new File(RESOURCES_DIR + "/../wsconsume/java").getAbsolutePath();
+ String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o " + absOutput + " --binding=" + RESOURCES_DIR + "/jaxws/jbws771/binding.xml " + wsdlURL.toExternalForm();
Process p = executeCommand(command);
// check status code
@@ -169,25 +168,20 @@
return definition;
}
- private Process executeCommand(String command)
- throws IOException
+ private Process executeCommand(String command) throws IOException
{
// be verbose
System.out.println("cmd: " + command);
- System.out.println("test execution dir: " + TEST_EXEC_DIR);
+ System.out.println("resources dir: " + RESOURCES_DIR);
- Process p = Runtime.getRuntime().exec(
- command,
- new String[] {"JBOSS_HOME="+ JBOSS_HOME, "JAVA_HOME="+ JDK_HOME}
- );
+ Process p = Runtime.getRuntime().exec(command, new String[] { "JBOSS_HOME=" + JBOSS_HOME, "JAVA_HOME=" + JDK_HOME });
return p;
}
- private void assertStatusCode(Process p, String s)
- throws InterruptedException
+ private void assertStatusCode(Process p, String s) throws InterruptedException
{
// check status code
int status = p.waitFor();
- assertTrue(s +" did exit with status " + status, status==0);
+ assertTrue(s + " did exit with status " + status, status == 0);
}
}
16 years, 8 months
JBossWS SVN: r7015 - framework/trunk/src/main/etc.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-13 06:38:03 -0400 (Tue, 13 May 2008)
New Revision: 7015
Modified:
framework/trunk/src/main/etc/wsconsume.bat
framework/trunk/src/main/etc/wsconsume.sh
framework/trunk/src/main/etc/wsprovide.bat
framework/trunk/src/main/etc/wsprovide.sh
Log:
Fixing wsconsume and wsprovide with the current native deployed files' name
Modified: framework/trunk/src/main/etc/wsconsume.bat
===================================================================
--- framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 07:01:18 UTC (rev 7014)
+++ framework/trunk/src/main/etc/wsconsume.bat 2008-05-13 10:38:03 UTC (rev 7015)
@@ -50,7 +50,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar
rem stack specific dependencies
-if exist %JBOSS_HOME%/client/jbossws-client.jar goto else
+if exist %JBOSS_HOME%/client/jbossws-native-client.jar goto else
rem JBossWS-Metro stack libraries
echo JBossWS-Metro stack deployed
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar
@@ -60,10 +60,11 @@
echo JBossWS-Native stack deployed
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
- set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
- set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
- set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
- set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
+ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
:endif
rem Execute the JVM
Modified: framework/trunk/src/main/etc/wsconsume.sh
===================================================================
--- framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 07:01:18 UTC (rev 7014)
+++ framework/trunk/src/main/etc/wsconsume.sh 2008-05-13 10:38:03 UTC (rev 7015)
@@ -66,7 +66,7 @@
fi
# is it a JBossWS-native or SunRI installation?
-if [ -f $LIBDIR/jbossws-client.jar ]; then
+if [ -f $LIBDIR/jbossws-native-client.jar ]; then
JBOSSWS_NATIVE="true"
fi
@@ -109,10 +109,11 @@
echo "JBossWS-Native stack deployed"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-client.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar"
fi
###
Modified: framework/trunk/src/main/etc/wsprovide.bat
===================================================================
--- framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 07:01:18 UTC (rev 7014)
+++ framework/trunk/src/main/etc/wsprovide.bat 2008-05-13 10:38:03 UTC (rev 7015)
@@ -48,7 +48,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar
rem stack specific dependencies
-if exist %JBOSS_HOME%/client/jbossws-client.jar goto else
+if exist %JBOSS_HOME%/client/jbossws-native-client.jar goto else
rem JBossWS-Metro stack libraries
echo JBossWS-Metro stack deployed
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar
@@ -63,10 +63,11 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
- set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
- set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar
- set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar
- set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
+ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
:endif
Modified: framework/trunk/src/main/etc/wsprovide.sh
===================================================================
--- framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 07:01:18 UTC (rev 7014)
+++ framework/trunk/src/main/etc/wsprovide.sh 2008-05-13 10:38:03 UTC (rev 7015)
@@ -66,7 +66,7 @@
fi
# is it a JBossWS-native or SunRI installation?
-if [ -f $LIBDIR/jbossws-client.jar ]; then
+if [ -f $LIBDIR/jbossws-native-client.jar ]; then
JBOSSWS_NATIVE="true"
fi
@@ -112,10 +112,11 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-client.jar"
+ WSPROVIDE_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-native-core.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxws.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-jaxrpc.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-native-saaj.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
fi
16 years, 8 months
JBossWS SVN: r7014 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-13 03:01:18 -0400 (Tue, 13 May 2008)
New Revision: 7014
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
restoring hibernate for AS 500 + adding asm to client classpath
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-12 18:46:26 UTC (rev 7013)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-13 07:01:18 UTC (rev 7014)
@@ -18,6 +18,8 @@
<properties>
<surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args>
<surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
+ <hibernate.version>3.2.4.sp1</hibernate.version>
+ <asm.version>2.2.3</asm.version>
</properties>
<!-- Modules -->
@@ -246,6 +248,16 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.client</groupId>
<artifactId>jbossall-client</artifactId>
<version>${jboss.version}</version>
16 years, 8 months
JBossWS SVN: r7013 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-12 14:46:26 -0400 (Mon, 12 May 2008)
New Revision: 7013
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
rollbacking Alessio's hibernate commit - it causes hudson regression
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-12 17:44:34 UTC (rev 7012)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-12 18:46:26 UTC (rev 7013)
@@ -18,7 +18,6 @@
<properties>
<surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args>
<surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
- <hibernate.version>3.2.4.sp1</hibernate.version>
</properties>
<!-- Modules -->
@@ -247,11 +246,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.client</groupId>
<artifactId>jbossall-client</artifactId>
<version>${jboss.version}</version>
@@ -285,11 +279,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.client</groupId>
<artifactId>jbossall-client</artifactId>
<version>${jboss.version}</version>
16 years, 8 months
JBossWS SVN: r7012 - in stack/native/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-12 13:44:34 -0400 (Mon, 12 May 2008)
New Revision: 7012
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
stack/native/trunk/src/main/etc/wstools.sh
Log:
Fixing org.jboss.test.ws.tools.scripts.ScriptTestCase regression
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-12 16:03:05 UTC (rev 7011)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-12 17:44:34 UTC (rev 7012)
@@ -47,7 +47,7 @@
JBOSS_HOME = System.getProperty("jboss.home");
TEST_EXEC_DIR = createResourceFile(".").getPath();
- JDK_HOME = System.getProperty("jdk.home");
+ JDK_HOME = System.getProperty("java.home");
OS = System.getProperty("os.name").toLowerCase();
}
Modified: stack/native/trunk/src/main/etc/wstools.sh
===================================================================
--- stack/native/trunk/src/main/etc/wstools.sh 2008-05-12 16:03:05 UTC (rev 7011)
+++ stack/native/trunk/src/main/etc/wstools.sh 2008-05-12 17:44:34 UTC (rev 7012)
@@ -58,13 +58,15 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/concurrent.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar"
# For Cygwin, switch paths to Windows format before running java
@@ -86,7 +88,7 @@
echo ""
echo " JAVA_OPTS: $JAVA_OPTS"
echo ""
-#echo " CLASSPATH: $WSTOOLS_CLASSPATH"
+echo " CLASSPATH: $WSTOOLS_CLASSPATH"
#echo ""
echo "========================================================================="
echo ""
16 years, 8 months