JBossWS SVN: r10824 - framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-02 06:10:22 -0400 (Fri, 02 Oct 2009)
New Revision: 10824
Modified:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
Log:
[JBWS-2674][JBWS-2754] providing test cases (WIP)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-10-01 16:18:03 UTC (rev 10823)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-10-02 10:10:22 UTC (rev 10824)
@@ -53,13 +53,22 @@
if (contextRoot == null)
throw new IllegalStateException("Cannot obtain context root");
- SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
- ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
- ServerConfig serverConfig = spi.getServerConfig();
+ // TODO: remove this hack - review API
+ String protocol = (String)dep.getService().getProperty("protocol");
+ String host = (String)dep.getService().getProperty("host");
+ Integer port = (Integer)dep.getService().getProperty("port");
+ Integer securePort = null;
- String host = serverConfig.getWebServiceHost();
- int port = serverConfig.getWebServicePort();
- int securePort = serverConfig.getWebServiceSecurePort();
+ if (protocol == null)
+ {
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
+ ServerConfig serverConfig = spi.getServerConfig();
+
+ host = serverConfig.getWebServiceHost();
+ port = serverConfig.getWebServicePort();
+ securePort = serverConfig.getWebServiceSecurePort();
+ }
for (Endpoint ep : dep.getService().getEndpoints())
{
boolean confidential = isConfidentialTransportGuarantee(dep, ep);
@@ -72,7 +81,7 @@
if (urlPattern.endsWith("/*"))
urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
- String protocol = confidential ? "https://" : "http://";
+ protocol = confidential ? "https://" : "http://";
ep.setAddress(protocol + hostAndPort + contextRoot + urlPattern);
}
}
15 years
JBossWS SVN: r10823 - stack/native/branches/dlofthouse/JBWS-2777/src/main/java/org/jboss/ws/tools/wsdl.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-01 12:18:03 -0400 (Thu, 01 Oct 2009)
New Revision: 10823
Modified:
stack/native/branches/dlofthouse/JBWS-2777/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
Add a comment to explain early file creation.
Modified: stack/native/branches/dlofthouse/JBWS-2777/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2777/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-10-01 15:59:28 UTC (rev 10822)
+++ stack/native/branches/dlofthouse/JBWS-2777/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-10-01 16:18:03 UTC (rev 10823)
@@ -516,6 +516,13 @@
String targetNS = getOptionalAttribute(schemaEl, "targetNamespace");
File tmpFile = null;
+ /*
+ * The temporary file for the schema is named and created early before this method recurses.
+ *
+ * This allows the publishedLocations map to be updated with the known filename before
+ * the file is actually written.
+ */
+
if (targetNS != null)
{
log.trace("processSchemaInclude: [targetNS=" + targetNS + ",parentURL=" + wsdlLoc + "]");
15 years
JBossWS SVN: r10822 - stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 11:59:28 -0400 (Thu, 01 Oct 2009)
New Revision: 10822
Modified:
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
Log:
Update test
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2009-10-01 15:58:57 UTC (rev 10821)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2009-10-01 15:59:28 UTC (rev 10822)
@@ -30,7 +30,6 @@
import org.jboss.test.ws.jaxws.endpoint.jse.endpoints.Endpoint1Iface;
import org.jboss.test.ws.jaxws.endpoint.jse.endpoints.Endpoint1Impl;
-import org.jboss.ws.Constants;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -40,23 +39,6 @@
*/
public final class UsecasesTestCase extends JBossWSTest
{
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- System.setProperty(Constants.HTTP_KEEP_ALIVE, Boolean.FALSE.toString());
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- System.getProperties().remove(Constants.HTTP_KEEP_ALIVE);
-
- super.tearDown();
- }
-
private int port1 = 8878; // 8878
private int port2 = 8878; // 8878
15 years
JBossWS SVN: r10821 - stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 11:58:57 -0400 (Thu, 01 Oct 2009)
New Revision: 10821
Modified:
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
Log:
[JBWS-2753] Survive closed connections not yet evicted from cache
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-10-01 14:01:17 UTC (rev 10820)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-10-01 15:58:57 UTC (rev 10821)
@@ -28,6 +28,7 @@
import java.net.URL;
import java.nio.channels.ClosedChannelException;
import java.util.Map;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -113,6 +114,26 @@
*/
public Object invoke(Object reqMessage, String targetAddress, boolean oneway, Map<String, Object> additionalHeaders, Map<String, Object> callProps) throws IOException
{
+ try
+ {
+ return invokeInternal(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
+ }
+ catch (ClosedChannelException cce)
+ {
+ if (NettyTransportHandler.getHttpKeepAliveSet())
+ {
+ log.info("Retrying with a new connection..."); //because using keep-alive connections it's possible to try re-using closed connections before they've been evicted
+ return invokeInternal(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
+ }
+ else
+ {
+ throw cce;
+ }
+ }
+ }
+
+ private Object invokeInternal(Object reqMessage, String targetAddress, boolean oneway, Map<String, Object> additionalHeaders, Map<String, Object> callProps) throws IOException
+ {
URL target;
try
{
@@ -153,7 +174,17 @@
//Get the response
Future<Result> futureResult = responseHandler.getFutureResult();
- Result result = timeout == null ? futureResult.get() : futureResult.get(timeout, TimeUnit.MILLISECONDS);
+ Result result = null;
+ try
+ {
+ result = timeout == null ? futureResult.get() : futureResult.get(timeout, TimeUnit.MILLISECONDS);
+ }
+ catch (ExecutionException ee)
+ {
+ //unwrap ExecutionException
+ Throwable t = ee.getCause();
+ throw t != null ? t : ee;
+ }
resHeaders = result.getResponseHeaders();
Object resMessage = oneway ? null : unmarshaller.read(result.getResponse(), resHeaders);
@@ -205,7 +236,7 @@
transport.finished(resHeaders);
}
}
-
+
private static SslHandler getSSLHandler(URL target, Map<String, Object> callProps) throws IOException
{
SslHandler handler = null;
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-10-01 14:01:17 UTC (rev 10820)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-10-01 15:58:57 UTC (rev 10821)
@@ -313,7 +313,7 @@
}
}
- public boolean getHttpKeepAliveSet()
+ public static boolean getHttpKeepAliveSet()
{
return keepAliveProp;
}
15 years
JBossWS SVN: r10820 - stack/cxf/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 10:01:17 -0400 (Thu, 01 Oct 2009)
New Revision: 10820
Modified:
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2740] Removing useless plugin
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 13:52:27 UTC (rev 10819)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 14:01:17 UTC (rev 10820)
@@ -14,11 +14,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <properties>
- <stack.name>cxf</stack.name>
- </properties>
-
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -88,49 +83,7 @@
</execution>
</executions>
</plugin>
-
-
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter-test</id>
- <!--This is for filter the stack name in the test-->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/tmp</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-back-test</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <outputDirectory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</outputDirectory>
- <resources>
- <resource>
- <directory>target/tmp</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
15 years
JBossWS SVN: r10819 - stack/native/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 09:52:27 -0400 (Thu, 01 Oct 2009)
New Revision: 10819
Modified:
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2740] Removing useless plugin
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 13:37:54 UTC (rev 10818)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 13:52:27 UTC (rev 10819)
@@ -13,10 +13,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <properties>
- <stack.name>native</stack.name>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -86,48 +82,7 @@
</execution>
</executions>
</plugin>
-
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter-test</id>
- <!--This is for filter the stack name in the test-->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/tmp</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-back-test</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <outputDirectory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</outputDirectory>
- <resources>
- <resource>
- <directory>target/tmp</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
15 years
JBossWS SVN: r10818 - stack/metro/trunk/modules/testsuite/framework-tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 09:37:54 -0400 (Thu, 01 Oct 2009)
New Revision: 10818
Modified:
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2740] Remove useless plugin
Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 13:37:01 UTC (rev 10817)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-10-01 13:37:54 UTC (rev 10818)
@@ -14,10 +14,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <properties>
- <stack.name>metro</stack.name>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -87,49 +83,7 @@
</execution>
</executions>
</plugin>
-
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter-test</id>
- <!--This is for filter the stack name in the test-->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/tmp</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-back-test</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <outputDirectory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</outputDirectory>
- <resources>
- <resource>
- <directory>target/tmp</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
15 years
JBossWS SVN: r10817 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 09:37:01 -0400 (Thu, 01 Oct 2009)
New Revision: 10817
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-2740] Use already available means of detecting running stack
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-10-01 13:34:11 UTC (rev 10816)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-10-01 13:37:01 UTC (rev 10817)
@@ -71,8 +71,24 @@
// Setup the classpath - do not modify this lightheartedly.
// Maybe you should extend the Class-Path in the MANIFEST instead.
StringBuffer cp = new StringBuffer(System.getProperty("test.classes.directory"));
- //${stack.name} will be filtered before executed in specific stack
- cp.append(PS + jbc + FS + "jbossws-${stack.name}-client.jar");
+ String stackName = null;
+ if (isIntegrationCXF())
+ {
+ stackName = "cxf";
+ }
+ else if (isIntegrationMetro())
+ {
+ stackName = "metro";
+ }
+ else if (isIntegrationNative())
+ {
+ stackName = "native";
+ }
+ else
+ {
+ throw new Exception("unsupported stack");
+ }
+ cp.append(PS + jbc + FS + "jbossws-" + stackName + "-client.jar");
cp.append(PS + jbc + FS + "jboss-common-core.jar");
cp.append(PS + jbc + FS + "jboss-logging-spi.jar");
cp.append(PS + jbc + FS + "jboss-logging-log4j.jar");
15 years
JBossWS SVN: r10816 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-01 09:34:11 -0400 (Thu, 01 Oct 2009)
New Revision: 10816
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
Log:
[JBWS-2701] Fixing testcase for Metro
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2009-10-01 12:48:18 UTC (rev 10815)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2009-10-01 13:34:11 UTC (rev 10816)
@@ -37,7 +37,7 @@
* [JBWS-2701] @XmlSeeAlso and generated wsdl
*
* @author alessio.soldano(a)jboss.com
- * @since 05-Aug-2009
+ * @since 30-Sep-2009
*/
public class JBWS2701TestCase extends JBossWSTest
{
@@ -51,6 +51,10 @@
public void testWSDL() throws Exception
{
URL url = new URL(endpointAddress + "?wsdl");
+ if (isIntegrationMetro())
+ {
+ url = new URL(endpointAddress + "?xsd=1");
+ }
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String line = br.readLine();
StringBuilder sb = new StringBuilder();
15 years