JBossWS SVN: r11007 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch01: modules/core and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 12:53:59 -0400 (Fri, 23 Oct 2009)
New Revision: 11007
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml
Log:
Applied patched for patch01
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml 2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
@@ -47,13 +47,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ <version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23 16:53:59 UTC (rev 11007)
@@ -92,6 +92,7 @@
try
{
cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.DECRYPT_MODE, null);
key = cipher.loadEncryptedKey(element);
}
catch (XMLSecurityException e)
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml 2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/modules/jaxws/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
@@ -24,6 +24,11 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>2.1</version>
+ </dependency>
</dependencies>
</project>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml 2009-10-23 15:08:45 UTC (rev 11006)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch01/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
@@ -72,7 +72,7 @@
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.2.6</woodstox.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
- <xmlsec.version>1.4.2</xmlsec.version>
+ <xmlsec.version>1.4.3</xmlsec.version>
<xalan.version>2.7.0</xalan.version>
<xerces.version>2.8.1</xerces.version>
</properties>
@@ -147,6 +147,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -233,6 +238,52 @@
<artifactId>juddi-service</artifactId>
<version>${jboss.jaxr.version}</version>
<type>sar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-saaj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>apache-scout</groupId>
14 years, 7 months
JBossWS SVN: r11006 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 11:08:45 -0400 (Fri, 23 Oct 2009)
New Revision: 11006
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/
Log:
Branch to apply patches.
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02 (from rev 11005, stack/native/tags/jbossws-native-3.1.2.SP3)
14 years, 7 months
JBossWS SVN: r11005 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 11:06:06 -0400 (Fri, 23 Oct 2009)
New Revision: 11005
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch01/
Removed:
stack/native/branches/jbossws-native-3.1.2.SP3-patch/
Log:
Making specific to the patch version.
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch01 (from rev 11004, stack/native/branches/jbossws-native-3.1.2.SP3-patch)
14 years, 7 months
JBossWS SVN: r11004 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 10:28:00 -0400 (Fri, 23 Oct 2009)
New Revision: 11004
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch/
Log:
Branch to apply patches.
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch (from rev 11003, stack/native/tags/jbossws-native-3.1.2.SP3)
14 years, 7 months
JBossWS SVN: r11003 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-23 08:44:48 -0400 (Fri, 23 Oct 2009)
New Revision: 11003
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2718] excluding test case
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-10-23 12:09:43 UTC (rev 11002)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-10-23 12:44:48 UTC (rev 11003)
@@ -12,3 +12,7 @@
# [JBWS-2634] Implement support for @EJB annotations in WS components (fixed in AS 501 and above)
org/jboss/test/ws/jaxws/jbws2634/**
+
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-10-23 12:09:43 UTC (rev 11002)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-10-23 12:44:48 UTC (rev 11003)
@@ -7,3 +7,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-10-23 12:09:43 UTC (rev 11002)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-10-23 12:44:48 UTC (rev 11003)
@@ -7,3 +7,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-23 12:09:43 UTC (rev 11002)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-23 12:44:48 UTC (rev 11003)
@@ -10,3 +10,6 @@
# [JBAS-7384] EndpointTestCase fails because of beanvalidation deployer
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-23 12:09:43 UTC (rev 11002)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-23 12:44:48 UTC (rev 11003)
@@ -7,3 +7,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
14 years, 7 months
JBossWS SVN: r11002 - in framework/branches/jbossws-framework-3.2.1/testsuite/test: java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-23 08:09:43 -0400 (Fri, 23 Oct 2009)
New Revision: 11002
Removed:
framework/branches/jbossws-framework-3.2.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/
framework/branches/jbossws-framework-3.2.1/testsuite/test/resources/jaxws/jbws2718/
Modified:
framework/branches/jbossws-framework-3.2.1/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2718] rollback because of broken TCK5
Modified: framework/branches/jbossws-framework-3.2.1/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-3.2.1/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-23 12:05:09 UTC (rev 11001)
+++ framework/branches/jbossws-framework-3.2.1/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-23 12:09:43 UTC (rev 11002)
@@ -847,17 +847,6 @@
</classes>
</war>
- <!-- jaxws-jbws2718 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2718.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2718/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2718/**/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws2718/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2718/WEB-INF">
- <include name="wsdl1/**"/>
- </webinf>
- </war>
-
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
14 years, 7 months
JBossWS SVN: r11001 - in stack/native/branches/jbossws-native-3.2.1.GA/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-23 08:05:09 -0400 (Fri, 23 Oct 2009)
New Revision: 11001
Modified:
stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
[JBWS-2718] rollback because of broken TCK5
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 12:00:53 UTC (rev 11000)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 12:05:09 UTC (rev 11001)
@@ -241,7 +241,7 @@
//check for sub-directories
resourcePath = resourcePath.substring(0, resourcePath.lastIndexOf("/") + 1);
- resourcePath = resourcePath + schemaLocation;
+ resourcePath = expLocation + resourcePath + schemaLocation;
while (resourcePath.indexOf("//") != -1)
{
resourcePath = resourcePath.replace("//", "/");
@@ -355,21 +355,19 @@
File wsdlFile;
if (wsdlLocation.indexOf(expLocation) >= 0)
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation));
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
- else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:")
- || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:"))
+ else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:"))
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(archiveName) + archiveName.length());
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1);
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
else
{
- throw new WSException("Invalid wsdlFile '" + wsdlLocation + "' location, expected in: " + expLocation);
+ throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation);
}
return wsdlFile;
}
-
}
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 12:00:53 UTC (rev 11000)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 12:05:09 UTC (rev 11001)
@@ -48,8 +48,7 @@
ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
File dataDir = serverConfig.getServerDataDir();
- String s = File.separator;
- File wsdlDir = new File(dataDir.getAbsolutePath() + s + "wsdl" + s + archive + s + "WEB-INF" + s + "wsdl" + s );
+ File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
if (wsdlDir.exists() == false)
{
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 12:00:53 UTC (rev 11000)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 12:05:09 UTC (rev 11001)
@@ -52,11 +52,11 @@
URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
-
+
TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
+
String dir = System.getProperty("wsdl.publish.location");
- String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/WEB-INF/wsdl/foo/bar/TestService.wsdl").getAbsolutePath());
+ String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr);
}
}
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 12:05:09 UTC (rev 11001)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/META-INF/wsdl/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 12:05:09 UTC (rev 11001)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceJSE</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/WEB-INF/wsdl/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
14 years, 7 months
JBossWS SVN: r11000 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-23 08:00:53 -0400 (Fri, 23 Oct 2009)
New Revision: 11000
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
[JBWS-2718] rollback because of broken TCK5
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 06:34:34 UTC (rev 10999)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-23 12:00:53 UTC (rev 11000)
@@ -241,7 +241,7 @@
//check for sub-directories
resourcePath = resourcePath.substring(0, resourcePath.lastIndexOf("/") + 1);
- resourcePath = resourcePath + schemaLocation;
+ resourcePath = expLocation + resourcePath + schemaLocation;
while (resourcePath.indexOf("//") != -1)
{
resourcePath = resourcePath.replace("//", "/");
@@ -355,21 +355,19 @@
File wsdlFile;
if (wsdlLocation.indexOf(expLocation) >= 0)
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation));
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
- else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:")
- || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:"))
+ else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:"))
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(archiveName) + archiveName.length());
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1);
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
else
{
- throw new WSException("Invalid wsdlFile '" + wsdlLocation + "' location, expected in: " + expLocation);
+ throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation);
}
return wsdlFile;
}
-
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 06:34:34 UTC (rev 10999)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-23 12:00:53 UTC (rev 11000)
@@ -48,8 +48,7 @@
ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
File dataDir = serverConfig.getServerDataDir();
- String s = File.separator;
- File wsdlDir = new File(dataDir.getAbsolutePath() + s + "wsdl" + s + archive + s + "WEB-INF" + s + "wsdl" + s );
+ File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
if (wsdlDir.exists() == false)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 06:34:34 UTC (rev 10999)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-23 12:00:53 UTC (rev 11000)
@@ -52,11 +52,11 @@
URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
-
+
TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
+
String dir = System.getProperty("wsdl.publish.location");
- String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/WEB-INF/wsdl/foo/bar/TestService.wsdl").getAbsolutePath());
+ String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr);
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 06:34:34 UTC (rev 10999)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/META-INF/wsdl/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 06:34:34 UTC (rev 10999)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-23 12:00:53 UTC (rev 11000)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceJSE</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/WEB-INF/wsdl/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
14 years, 7 months