JBossWS SVN: r7289 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-03 09:12:17 -0400 (Tue, 03 Jun 2008)
New Revision: 7289
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2197][JBWS-2098] Exclude CXF encryption test on AS 5.0.x
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-03 12:56:10 UTC (rev 7288)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-03 13:12:17 UTC (rev 7289)
@@ -128,3 +128,6 @@
org/jboss/test/ws/jaxws/samples/advanced/retail/**
org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+
+# [JBWS-2197] Dynamically load Bouncy Castle provider on AS 5.0.x
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-03 12:56:10 UTC (rev 7288)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-03 13:12:17 UTC (rev 7289)
@@ -125,3 +125,6 @@
# [JBWS-2194] request requires HTTP authentication: Unauthorized
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+
+# [JBWS-2197] Dynamically load Bouncy Castle provider on AS 5.0.x
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
16 years, 6 months
JBossWS SVN: r7288 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-03 08:56:10 -0400 (Tue, 03 Jun 2008)
New Revision: 7288
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
Fix ScriptTestCase: Provide correct JAVA_HOME
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-06-03 12:55:39 UTC (rev 7287)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-06-03 12:56:10 UTC (rev 7288)
@@ -23,8 +23,7 @@
// $Id$
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
import org.jboss.wsf.test.JBossWSTest;
@@ -50,6 +49,8 @@
private String TEST_DIR;
private String OS;
+ private String origJavaHome;
+
protected void setUp() throws Exception
{
super.setUp();
@@ -57,10 +58,26 @@
JBOSS_HOME = System.getProperty("jboss.home");
CLASSES_DIR = System.getProperty("test.classes.directory");
TEST_DIR = createResourceFile("..").getAbsolutePath();
- JAVA_HOME = System.getProperty("java.home");
+ origJavaHome = System.getProperty("java.home");
OS = System.getProperty("os.name").toLowerCase();
+
+
+ // the script requires the system JAVA_HOME, which points to the JDK not the JRE
+ if(origJavaHome.indexOf("/jre")!=-1)
+ {
+ String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf("/jre"));
+ System.setProperty("java.home", JDK_HOME);
+ JAVA_HOME= JDK_HOME;
+ }
}
+
+ protected void tearDown() throws Exception
+ {
+ // reset surefire's JAVA_HOME
+ System.setProperty("java.home", origJavaHome);
+ }
+
public void testWSConsumeFromCommandLine() throws Exception
{
if (isWindowsOS())
@@ -72,7 +89,7 @@
String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
String absOutput = new File(TEST_DIR, "wsconsume/java").getAbsolutePath();
- String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o " + absOutput + " " + absWsdlLoc;
+ String command = JBOSS_HOME + "/bin/wsconsume.sh -v -k -o " + absOutput + " " + absWsdlLoc;
Process p = executeCommand(command);
// check status code
@@ -116,9 +133,32 @@
{
// check status code
int status = p.waitFor();
+ dumpStream(p.getInputStream());
+ dumpStream(p.getErrorStream());
+
assertTrue(s + " did exit with status " + status, status == 0);
}
+ private void dumpStream(InputStream in)
+ {
+ try
+ {
+ BufferedInputStream bin = new BufferedInputStream (in);
+ StringBuffer out = new StringBuffer();
+ byte[] b = new byte[4096];
+ for (int n; (n = bin.read(b)) != -1;)
+ {
+ out.append(new String(b, 0, n));
+ }
+
+ System.out.println(out.toString());
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("", e);
+ }
+ }
+
private boolean isWindowsOS()
{
return ((OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1));
16 years, 6 months
JBossWS SVN: r7287 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-03 08:55:39 -0400 (Tue, 03 Jun 2008)
New Revision: 7287
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
Fix WSConsumerTestCase
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2008-06-03 12:32:41 UTC (rev 7286)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2008-06-03 12:55:39 UTC (rev 7287)
@@ -24,11 +24,8 @@
import org.jboss.wsf.spi.tools.WSContractConsumer;
import org.jboss.wsf.test.JBossWSTest;
-import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceFeature;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.PrintStream;
+import java.io.*;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
@@ -84,16 +81,21 @@
consumeWSDL();
- Class sei = loadEndpointInterface("testBindingFiles");
+ File sei = loadEndpointInterface("testBindingFiles");
+
+ boolean containsAsyncOperations = false;
+ BufferedReader bin = new BufferedReader( new FileReader(sei) );
- boolean containsAsyncOperations = false;
- for (Method m : sei.getDeclaredMethods())
+ String l = bin.readLine();
+ while(l!=null)
{
- if (m.getName().equals("echoAsync"))
+ if(l.indexOf("echoAsync")!=-1)
{
- containsAsyncOperations = true;
+ containsAsyncOperations=true;
break;
}
+
+ l = bin.readLine();
}
assertTrue("External binding file was ignored", containsAsyncOperations);
@@ -173,9 +175,9 @@
File seiSource = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java");
assertTrue("SEI not generated", seiSource.exists());
-
- Class seiClass = loadEndpointInterface("testTargetPackage");
- assertNotNull("Cannot load SEI class", seiClass);
+
+ File seiClass = loadEndpointInterface("testTargetPackage");
+ assertTrue("Cannot load SEI class", seiClass.exists());
}
/**
@@ -186,19 +188,32 @@
{
consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation");
consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl");
- consumer.setGenerateSource(true);
- consumer.setNoCompile(false); // explicitly enable compilation
+ consumer.setGenerateSource(true);
consumeWSDL();
- //URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService";
- Class sei = loader.loadClass(seiClassName);
+ File sei = loadEndpointInterface("testWsdlLocation", "TestService.java");
+ BufferedReader bin = new BufferedReader( new FileReader(sei) );
+
+ boolean match = false;
+ String prevLine = null;
+ String l = bin.readLine();
+ while(l!=null)
+ {
+ if(l.indexOf("public class TestService")!=-1)
+ {
+ if(prevLine!=null && prevLine.startsWith("@WebServiceClient"))
+ {
+ match = true;
+ break;
+ }
+ }
- WebServiceClient webServiceClient = (WebServiceClient)sei.getAnnotation(WebServiceClient.class);
- assertNotNull("@WebServiceClient not generated on service interface", webServiceClient);
- assertEquals("@WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation());
+ prevLine = l;
+ l = bin.readLine();
+ }
+
+ assertTrue("@WebServiceClient not generated on service interface", match);
}
/**
@@ -309,12 +324,13 @@
consumer.setOutputDirectory(outputDirectory);
consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
}
-
- private Class loadEndpointInterface(String testName) throws MalformedURLException, ClassNotFoundException
+
+ private File loadEndpointInterface(String testName, String... fileName) throws MalformedURLException, ClassNotFoundException
{
- URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
- String seiClassName = "org.jboss.test.ws.tools." + testName + ".EndpointInterface";
- Class sei = loader.loadClass(seiClassName);
+ String name = fileName.length> 0 ? fileName[0] : "EndpointInterface.java";
+ String interfaceFile = "org/jboss/test/ws/tools/" + testName + "/"+name;
+ File sei = new File(outputDirectory, interfaceFile);
+ if(!sei.exists()) throw new IllegalStateException(sei.getAbsolutePath() + " doesn't exist!");
return sei;
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-03 12:32:41 UTC (rev 7286)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-03 12:55:39 UTC (rev 7287)
@@ -211,9 +211,10 @@
}
}
+
+ List<URL> jarFirstClasspath = new ArrayList<URL>();
- // Replace the ThreadContextLoader to prevent loading from target/classes and target/test-classes
- List<URL> jarFirstClasspath = new ArrayList<URL>();
+ // Replace the ThreadContextLoader to prevent loading from target/classes and target/test-classes
jarFirstClasspath.addAll(jarURLs);
jarFirstClasspath.addAll(classDirUrls);
URLClassLoader jarFirstClassLoader = new URLClassLoader(jarFirstClasspath.toArray( new URL[] {}), this.origClassLoader);
16 years, 6 months
JBossWS SVN: r7286 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-03 08:32:41 -0400 (Tue, 03 Jun 2008)
New Revision: 7286
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
JBWS-2170: Exclude embedded tests for any container except 501
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-03 12:31:55 UTC (rev 7285)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-03 12:32:41 UTC (rev 7286)
@@ -32,3 +32,6 @@
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
+
+# [JBWS-2170] Fix embedded for maven build
+org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-03 12:31:55 UTC (rev 7285)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-03 12:32:41 UTC (rev 7286)
@@ -26,3 +26,6 @@
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
+
+# [JBWS-2170] Fix embedded for maven build
+org/jboss/test/ws/embedded/**
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-03 12:31:55 UTC (rev 7285)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-03 12:32:41 UTC (rev 7286)
@@ -10,3 +10,5 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# [JBWS-2170] Fix embedded for maven build
+org/jboss/test/ws/embedded/**
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-03 12:31:55 UTC (rev 7285)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-03 12:32:41 UTC (rev 7286)
@@ -23,3 +23,5 @@
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
+# [JBWS-2170] Fix embedded for maven build
+org/jboss/test/ws/embedded/**
\ No newline at end of file
16 years, 6 months
JBossWS SVN: r7285 - container/jboss50/branches/jbossws-jboss501.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-03 08:31:55 -0400 (Tue, 03 Jun 2008)
New Revision: 7285
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
Log:
JBWS-2170: Fix embedded for maven build
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-06-03 12:25:21 UTC (rev 7284)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-06-03 12:31:55 UTC (rev 7285)
@@ -29,6 +29,7 @@
<jboss.jbossxb.version>2.0.0.CR8</jboss.jbossxb.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
</properties>
<!-- DependencyManagement -->
@@ -135,6 +136,25 @@
<artifactId>jbossxb</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.org.jboss.microcontainer}</version>
+
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.org.jboss.microcontainer}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0.Beta12</version>
+ </dependency>
+
<!-- thirdparty -->
<dependency>
<groupId>javax.xml.ws</groupId>
16 years, 6 months
JBossWS SVN: r7284 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-03 08:25:21 -0400 (Tue, 03 Jun 2008)
New Revision: 7284
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoaderMBean.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/jboss-service.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/bcprov-jdk14.jar
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
Log:
[JBWS-2098] Dynamically install bouncy castle provider when running encryption test
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-06-03 12:21:28 UTC (rev 7283)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-06-03 12:25:21 UTC (rev 7284)
@@ -95,6 +95,17 @@
<include name="bob.properties" />
</zipfileset>
</war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.sar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="jboss-service.xml" />
+ </metainf>
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader*.class"/>
+ </fileset>
+ <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt">
+ <include name="bcprov*.jar" />
+ </fileset>
+ </jar>
<!-- jaxws-samples-wsse-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader.java 2008-06-03 12:25:21 UTC (rev 7284)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.security.Security;
+import org.jboss.logging.Logger;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import javax.crypto.Cipher;
+
+//$Id$
+
+/**
+ * Loads / unloads the Bouncy Castle JCE provider
+ *
+ */
+public class BouncyCastleLoader implements BouncyCastleLoaderMBean
+{
+ private static Logger log = Logger.getLogger(BouncyCastleLoader.class);
+
+ public void start() throws Exception
+ {
+ BouncyCastleProvider bcp = new BouncyCastleProvider();
+ Security.addProvider(bcp);
+ Cipher c = Cipher.getInstance("RSA", "BC");
+ log.info("Created RSA cipher: " + c + ", provider:" + c.getProvider());
+ }
+
+ public void stop() throws Exception
+ {
+ BouncyCastleProvider bcp = new BouncyCastleProvider();
+ Security.removeProvider(bcp.getName());
+ log.info("Bouncy Castle provider removed.");
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoader.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoaderMBean.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoaderMBean.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoaderMBean.java 2008-06-03 12:25:21 UTC (rev 7284)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+public interface BouncyCastleLoaderMBean
+{
+ public void start() throws Exception;
+
+ public void stop() throws Exception;
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/BouncyCastleLoaderMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-06-03 12:21:28 UTC (rev 7283)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-06-03 12:25:21 UTC (rev 7284)
@@ -56,7 +56,8 @@
public static Test suite()
{
- return new JBossWSTestSetup(SignEncryptTestCase.class,"jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war");
+ return new JBossWSTestSetup(SignEncryptTestCase.class,
+ "jaxws-samples-wsse-sign-encrypt.sar jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war");
}
public void test() throws Exception
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/jboss-service.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/jboss-service.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/jboss-service.xml 2008-06-03 12:25:21 UTC (rev 7284)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.test.ws.jaxws.samples.wsse.BouncyCastleLoader" name="org.jboss.test.ws.jaxws.samples.wsse:service=BouncyCastleLoader"/>
+</server>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/bcprov-jdk14.jar
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/bcprov-jdk14.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 6 months
JBossWS SVN: r7283 - in stack/cxf/trunk/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-03 08:21:28 -0400 (Tue, 03 Jun 2008)
New Revision: 7283
Modified:
stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2098] Do not deploy bouncy castle provider (revert 7214)
Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-06-03 11:47:07 UTC (rev 7282)
+++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-06-03 12:21:28 UTC (rev 7283)
@@ -70,7 +70,6 @@
</patternset>
<patternset id="jbossws.service.lib.patternset">
- <include name="**/bcprov-jdk14.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/geronimo-javamail*.jar"/>
<include name="**/geronimo-ws-metadata*.jar"/>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-03 11:47:07 UTC (rev 7282)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-03 12:21:28 UTC (rev 7283)
@@ -46,7 +46,6 @@
<include>*:FastInfoset:jar</include>
<include>*:wss4j:jar</include>
<include>*:xmlsec:jar</include>
- <include>*:bcprov-jdk14:jar</include>
</includes>
</dependencySet>
<dependencySet>
16 years, 6 months
JBossWS SVN: r7282 - stack/native/trunk/modules/testsuite/native-tests.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-03 07:47:07 -0400 (Tue, 03 Jun 2008)
New Revision: 7282
Modified:
stack/native/trunk/modules/testsuite/native-tests/pom.xml
Log:
Remove MC dependency
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-06-03 11:47:03 UTC (rev 7281)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-06-03 11:47:07 UTC (rev 7282)
@@ -14,12 +14,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
-
- <properties>
- <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer>
- </properties>
-
-
<!-- Dependencies -->
<dependencies>
<dependency>
16 years, 6 months
JBossWS SVN: r7281 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-03 07:47:03 -0400 (Tue, 03 Jun 2008)
New Revision: 7281
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBWS-2124] Expose http chunking through SOAPConnection
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-06-03 11:05:24 UTC (rev 7280)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-06-03 11:47:03 UTC (rev 7281)
@@ -114,9 +114,6 @@
// HTTPClientInvoker conect sends gratuitous POST
// http://jira.jboss.com/jira/browse/JBWS-711
clientConfig.put(Client.ENABLE_LEASE, false);
-
- // Enable chunked encoding. This is the default size.
- clientConfig.put("chunkedLength", "1024");
}
public boolean isClosed()
@@ -315,34 +312,37 @@
{
populateHeaders(reqMessage, metadata);
- if (chunkedLength != null)
+ // Enable chunked encoding. This is the default size.
+ int chunkSizeValue = (chunkedLength != null ? chunkedLength : 1024);
+
+ // Overwrite, through endpoint config
+ if (msgContext != null)
{
- clientConfig.put("chunkedLength", chunkedLength.toString());
- }
- else if (msgContext != null)
- {
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
CommonConfig config = epMetaData.getConfig();
- // chunksize settings
- String chunkSizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
- int chunkSize = chunkSizeValue != null ? Integer.valueOf(chunkSizeValue) : -1;
- boolean isFastInfoset = epMetaData.isFeatureEnabled(FastInfosetFeature.class);
- if (chunkSize > 0 && isFastInfoset == false)
- {
- clientConfig.put("chunkedLength", chunkSizeValue);
- }
- else
- {
- clientConfig.remove("chunkedLength");
- }
+ String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
+ if (sizeValue != null)
+ chunkSizeValue = Integer.valueOf(sizeValue);
+
+ if (epMetaData.isFeatureEnabled(FastInfosetFeature.class))
+ chunkSizeValue = 0;
}
+
+ if (chunkSizeValue > 0)
+ {
+ clientConfig.put("chunkedLength", new Integer(chunkSizeValue));
+ }
+ else
+ {
+ clientConfig.remove("chunkedLength");
+ }
}
else
{
metadata.put("TYPE", "GET");
}
-
+
if (callProps != null)
{
Iterator it = callProps.entrySet().iterator();
16 years, 6 months
JBossWS SVN: r7280 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-03 07:05:24 -0400 (Tue, 03 Jun 2008)
New Revision: 7280
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBWS-2124] Expose http chunking through SOAPConnection
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-06-03 10:57:59 UTC (rev 7279)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-06-03 11:05:24 UTC (rev 7280)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.client;
-// $Id$
+// $Id: $
import java.io.IOException;
import java.lang.reflect.Field;
@@ -105,14 +105,18 @@
}
private boolean closed;
-
+ private Integer chunkedLength;
+
private static final RMChannel RM_CHANNEL = RMChannel.getInstance();
-
+
public HTTPRemotingConnection()
{
// HTTPClientInvoker conect sends gratuitous POST
// http://jira.jboss.com/jira/browse/JBWS-711
clientConfig.put(Client.ENABLE_LEASE, false);
+
+ // Enable chunked encoding. This is the default size.
+ clientConfig.put("chunkedLength", "1024");
}
public boolean isClosed()
@@ -125,6 +129,16 @@
this.closed = closed;
}
+ public Integer getChunkedLength()
+ {
+ return chunkedLength;
+ }
+
+ public void setChunkedLength(Integer chunkedLength)
+ {
+ this.chunkedLength = chunkedLength;
+ }
+
/**
* Sends the given message to the specified endpoint.
*
@@ -174,7 +188,7 @@
{
// Get the invoker from Remoting for a given endpoint address
log.debug("Get locator for: " + endpoint);
-
+
/**
* [JBWS-1704] The Use Of Remoting Causes An Additional 'datatype' Parameter To Be Sent On All Requests
*
@@ -206,16 +220,16 @@
RMMetadata rmMetadata = new RMMetadata(getRemotingVersion(), targetAddress, marshaller, unmarshaller, callProps, metadata, clientConfig);
return RM_CHANNEL.send(reqMessage, rmMetadata);
}
- else
+ else
{
Client client = new Client(locator, "jbossws", clientConfig);
client.connect();
client.setMarshaller(marshaller);
- if (oneway == false)
+ if (oneway == false)
client.setUnMarshaller(unmarshaller);
-
+
if (log.isDebugEnabled())
log.debug("Remoting metadata: " + metadata);
@@ -235,7 +249,7 @@
// Disconnect the remoting client
client.disconnect();
-
+
callProps.clear();
callProps.putAll(metadata);
@@ -257,7 +271,7 @@
throw io;
}
}
-
+
private String addURLParameter(String urlStr, String key, String value) throws MalformedURLException
{
URL url = new URL(urlStr);
@@ -267,7 +281,7 @@
private String getRemotingVersion()
{
- String version = null;
+ String version = null;
try
{
// Access the constant dynamically, otherwise it will be the compile time value
@@ -278,7 +292,7 @@
{
throw new RuntimeException("Cannot obtain remoting version", ex);
}
-
+
if (version == null)
{
URL codeURL = Version.class.getProtectionDomain().getCodeSource().getLocation();
@@ -301,12 +315,12 @@
{
populateHeaders(reqMessage, metadata);
- // Enable chunked encoding. This is the default size.
- clientConfig.put("chunkedLength", "1024");
-
- // May be overridden through endpoint config
- if (msgContext != null)
+ if (chunkedLength != null)
{
+ clientConfig.put("chunkedLength", chunkedLength.toString());
+ }
+ else if (msgContext != null)
+ {
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
CommonConfig config = epMetaData.getConfig();
@@ -316,7 +330,7 @@
boolean isFastInfoset = epMetaData.isFeatureEnabled(FastInfosetFeature.class);
if (chunkSize > 0 && isFastInfoset == false)
{
- clientConfig.put(EndpointProperty.CHUNKED_ENCODING_SIZE, chunkSizeValue);
+ clientConfig.put("chunkedLength", chunkSizeValue);
}
else
{
@@ -328,7 +342,7 @@
{
metadata.put("TYPE", "GET");
}
-
+
if (callProps != null)
{
Iterator it = callProps.entrySet().iterator();
16 years, 6 months