Author: thomas.diesler(a)jboss.com Date: 2006-12-21 19:07:12 -0500 (Thu, 21 Dec 2006) New Revision: 1713 Added: branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt Removed: branches/tdiesler/trunk/jbossws/src/main/etc/ branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt Modified: branches/tdiesler/trunk/jbossws/.classpath branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java branches/tdiesler/trunk/jbossws/src/test/build.xml branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java Log: partial commit Modified: branches/tdiesler/trunk/jbossws/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws/.classpath 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/.classpath 2006-12-22 00:07:12 UTC (rev 1713) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-22 00:07:12 UTC (rev 1713) @@ -61,7 +61,7 @@ /** The string identifing this deployment **/ public String name; /** The URL to the expanded webapp **/ - public URL expandedWebApp; + public URL webappURL; /** We can hold "typed" metadata */ public Object metaData; /** The deployment classloader **/ Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2006-12-22 00:07:12 UTC (rev 1713) @@ -74,12 +74,20 @@ private static Map<String, String> configMap = new HashMap<String, String>(); static { - configMap.put(StubExt.PROPERTY_KEY_STORE, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH); - configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD); - configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE); - configMap.put(StubExt.PROPERTY_TRUST_STORE, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH); - configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD); - configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE); + // Remoting constants since 2.0.0.GA + //configMap.put(StubExt.PROPERTY_KEY_STORE, SSLSocketBuilder.REMOTING_KEY_STORE_FILE_PATH); + //configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, SSLSocketBuilder.REMOTING_KEY_STORE_PASSWORD); + //configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, SSLSocketBuilder.REMOTING_KEY_STORE_TYPE); + //configMap.put(StubExt.PROPERTY_TRUST_STORE, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH); + //configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD); + //configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE); + + configMap.put(StubExt.PROPERTY_KEY_STORE, "org.jboss.remoting.keyStore"); + configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, "org.jboss.remoting.keyStorePassword"); + configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, "org.jboss.remoting.keyStoreType"); + configMap.put(StubExt.PROPERTY_TRUST_STORE, "org.jboss.remoting.trustStore"); + configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, "org.jboss.remoting.trustStorePassword"); + configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, "org.jboss.remoting.trustStoreType"); } private boolean closed; @@ -272,7 +280,8 @@ Map<String, Object> metadata = new HashMap<String, Object>(); // We need to unmarshall faults (HTTP 500) - metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true"); + // metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true"); // since 2.0.0.GA + metadata.put("NoThrowOnError", "true"); Properties props = new Properties(); metadata.put("HEADER", props); Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-22 00:07:12 UTC (rev 1713) @@ -113,7 +113,7 @@ <target name="init" depends="prepare,thirdparty"> <!-- Define excluded tests --> - <condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"> + <condition property="tests.excludesfile" value="${test.resources.dir}/tests-excludes.txt"> <equals arg1="${jbossws.target.server}" arg2="jboss"/> </condition> <condition property="tests.excludesfile" value="${test.resources.dir}/tests-tomcat-excludes.txt"> @@ -319,7 +319,7 @@ <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/> </antcall> <antcall target="tests-report"/> </target> @@ -328,7 +328,7 @@ <target name="tests-benchmark" description="Run benchmark unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/> </antcall> <antcall target="tests-report"/> </target> @@ -346,7 +346,7 @@ <target name="tests-tools" description="Run tools unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/> </antcall> <antcall target="tests-report"/> </target> @@ -358,7 +358,7 @@ <target name="test" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> - <param name="excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${test.resources.dir}/tests-excludes.txt"/> </antcall> </target> Modified: branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-22 00:07:12 UTC (rev 1713) @@ -34,8 +34,6 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.client.AppClientLauncher; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref @@ -72,6 +70,7 @@ assertEquals(helloWorld, retObj); } + /* externalize public void testApplicationClient() throws Throwable { String helloWorld = "Hello World!"; @@ -81,4 +80,5 @@ apl.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld}); assertEquals(helloWorld, ApplicationClient.retStr); } + */ } Copied: branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt (from rev 1685, branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt) =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-21 12:54:28 UTC (rev 1685) +++ branches/tdiesler/trunk/jbossws/src/test/resources/tests-excludes.txt 2006-12-22 00:07:12 UTC (rev 1713) @@ -0,0 +1 @@ +org/jboss/test/ws/*/benchmark/** \ No newline at end of file Deleted: branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-21 21:26:29 UTC (rev 1712) +++ branches/tdiesler/trunk/jbossws/src/test/resources/tests-no-excludes.txt 2006-12-22 00:07:12 UTC (rev 1713) @@ -1 +0,0 @@ -/nothing-to-exclude/** \ No newline at end of file