JBossWS SVN: r10800 - framework/branches/ropalka/src/main/java/org/jboss/wsf/framework.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-30 04:23:15 -0400 (Wed, 30 Sep 2009)
New Revision: 10800
Modified:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
Log:
[JBWS-2674][JBWS-2754] refactoring (WIP)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-30 08:11:08 UTC (rev 10799)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-30 08:23:15 UTC (rev 10800)
@@ -27,6 +27,7 @@
import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
+import org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory;
import org.jboss.wsf.framework.security.DefaultSecurityAdapterFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
@@ -39,6 +40,7 @@
import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
import org.jboss.wsf.spi.util.ServiceLoader;
@@ -94,6 +96,10 @@
{
returnType = loadService(spiType, DefaultSecurityAdapterFactory.class);
}
+ else if (EndpointRegistryFactory.class.equals(spiType))
+ {
+ returnType = loadService(spiType, DefaultEndpointRegistryFactory.class);
+ }
else
{
// SPI provided by either container or stack integration that has no default implementation
15 years, 3 months
JBossWS SVN: r10799 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-30 04:11:08 -0400 (Wed, 30 Sep 2009)
New Revision: 10799
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1666/
Modified:
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-2740]:Removed the jbws1666 test from native specific testsuite and enabled it in framework test
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:08:32 UTC (rev 10798)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:11:08 UTC (rev 10799)
@@ -13,6 +13,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <stack.name>native</stack.name>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -82,7 +86,48 @@
</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>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-30 08:08:32 UTC (rev 10798)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-30 08:11:08 UTC (rev 10799)
@@ -224,13 +224,6 @@
<include name="wsdl/attack-service.wsdl"/>
</webinf>
</war>
-
- <!-- jaxws-jbws1666 -->
- <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
- </classes>
- </war>
<!-- jaxws-jbws1809 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar">
15 years, 3 months
JBossWS SVN: r10798 - in stack/metro/trunk: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-30 04:08:32 -0400 (Wed, 30 Sep 2009)
New Revision: 10798
Modified:
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/trunk/pom.xml
Log:
[JBWS-2740]:Fixed classpath entries in metro client jar and enabled framework test jbws1666
Modified: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/trunk/modules/client/pom.xml 2009-09-30 08:06:07 UTC (rev 10797)
+++ stack/metro/trunk/modules/client/pom.xml 2009-09-30 08:08:32 UTC (rev 10798)
@@ -90,23 +90,40 @@
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
- </dependency>
-
-
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <artifactId>maven-archiver</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
<configuration>
<archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated-->
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ </manifest>
<manifestEntries>
- <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path>
+ <Class-Path>jbossws-framework.jar jaxws-common.jar jaxws-api.jar stax-api.jar wstx.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
+
</plugins>
</build>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-09-30 08:06:07 UTC (rev 10797)
+++ stack/metro/trunk/modules/server/pom.xml 2009-09-30 08:08:32 UTC (rev 10798)
@@ -108,6 +108,15 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
</dependencies>
<!-- Plugins -->
Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:06:07 UTC (rev 10797)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:08:32 UTC (rev 10798)
@@ -14,6 +14,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <stack.name>metro</stack.name>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -83,7 +87,49 @@
</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>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-09-30 08:06:07 UTC (rev 10797)
+++ stack/metro/trunk/pom.xml 2009-09-30 08:08:32 UTC (rev 10798)
@@ -74,6 +74,7 @@
<woodstox.version>3.2.6</woodstox.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<jsr181.version>1.0-MR1</jsr181.version>
+ <jsr250.version>1.0</jsr250.version>
</properties>
<!-- DependencyManagement -->
@@ -321,12 +322,35 @@
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>${jsr181.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jsr250.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- Plugins -->
<build>
+
+ <!-- PluginMangament-->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <artifactId>maven-archiver</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -392,6 +416,8 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
+
<repository>
<id>snapshots.jboss.org</id>
<url>http://snapshots.jboss.org/maven2</url>
15 years, 3 months
JBossWS SVN: r10797 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-30 04:06:07 -0400 (Wed, 30 Sep 2009)
New Revision: 10797
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/jbws1666/
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2740]:Remove the jbws1666 testcase in cxf-test module and put it in framework testsuite
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-09-30 08:04:07 UTC (rev 10796)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-09-30 08:06:07 UTC (rev 10797)
@@ -67,13 +67,6 @@
<include name="cxf.xml" />
</metainf>
</jar>
-
- <!-- jaxws-jbws1666 -->
- <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
- </classes>
- </war>
<!-- Please add alphabetically -->
</target>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:04:07 UTC (rev 10796)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:06:07 UTC (rev 10797)
@@ -14,6 +14,11 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <stack.name>cxf</stack.name>
+ </properties>
+
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -83,7 +88,49 @@
</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, 3 months
JBossWS SVN: r10796 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-30 04:04:07 -0400 (Wed, 30 Sep 2009)
New Revision: 10796
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/
framework/trunk/testsuite/test/resources/jaxws/jbws1666/
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-2740]:Added the jbws1666 testcase to framework testsuite
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-09-30 05:50:48 UTC (rev 10795)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-09-30 08:04:07 UTC (rev 10796)
@@ -269,7 +269,14 @@
<include name="org/jboss/test/ws/jaxws/jbws1665/**/*.class"/>
</fileset>
</jar>
-
+
+ <!-- jaxws-jbws1666 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws1694 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1694.jar">
<fileset dir="${tests.output.dir}/test-classes">
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666 (from rev 10709, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666)
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-09-17 10:04:11 UTC (rev 10709)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-09-30 08:04:07 UTC (rev 10796)
@@ -71,7 +71,8 @@
// 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"));
- cp.append(PS + jbc + FS + "jbossws-native-client.jar");
+ //${stack.name} will be filtered before executed in specific stack
+ cp.append(PS + jbc + FS + "jbossws-${stack.name}-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");
Copied: framework/trunk/testsuite/test/resources/jaxws/jbws1666 (from rev 10709, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1666)
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws1666
___________________________________________________________________
Name: svn:mergeinfo
+
15 years, 3 months
JBossWS SVN: r10795 - in stack/metro/trunk: modules/client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-09-30 01:50:48 -0400 (Wed, 30 Sep 2009)
New Revision: 10795
Modified:
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/pom.xml
Log:
Added the missing jsr181 dependency to fix the build
Modified: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/trunk/modules/client/pom.xml 2009-09-29 17:26:50 UTC (rev 10794)
+++ stack/metro/trunk/modules/client/pom.xml 2009-09-30 05:50:48 UTC (rev 10795)
@@ -87,7 +87,12 @@
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-09-29 17:26:50 UTC (rev 10794)
+++ stack/metro/trunk/pom.xml 2009-09-30 05:50:48 UTC (rev 10795)
@@ -73,6 +73,7 @@
<sun.saaj.impl.version>1.3</sun.saaj.impl.version>
<woodstox.version>3.2.6</woodstox.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
+ <jsr181.version>1.0-MR1</jsr181.version>
</properties>
<!-- DependencyManagement -->
@@ -315,6 +316,12 @@
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jsr181.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
15 years, 3 months
JBossWS SVN: r10794 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-29 13:26:50 -0400 (Tue, 29 Sep 2009)
New Revision: 10794
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Using jbossws-framework snapshot
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-09-29 17:22:33 UTC (rev 10793)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-09-29 17:26:50 UTC (rev 10794)
@@ -48,7 +48,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0.SP2</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP4</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
15 years, 3 months
JBossWS SVN: r10793 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-29 13:22:33 -0400 (Tue, 29 Sep 2009)
New Revision: 10793
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
Log:
[JBPAPP-2825] Fixing test (no changes to the stack behaviour)
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2009-09-29 16:25:45 UTC (rev 10792)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2009-09-29 17:22:33 UTC (rev 10793)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.ws.jaxws.samples.context;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URI;
import java.security.Principal;
import javax.annotation.Resource;
@@ -85,7 +87,7 @@
return "fail";
// Check standard jaxws properties
- InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
+ Object wsdl = msgContext.get(MessageContext.WSDL_DESCRIPTION);
QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
@@ -102,8 +104,21 @@
try
{
- Element root = DOMUtils.parse(wsdlSource);
- new DOMWriter(System.out).setPrettyprint(true).print(root);
+ Element root = null;
+ if (wsdl instanceof InputSource)
+ {
+ root = DOMUtils.parse((InputSource)wsdl);
+ }
+ else if (wsdl instanceof URI)
+ {
+ root = DOMUtils.parse(((URI)wsdl).toURL().openStream());
+ }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ new DOMWriter(out).setPrettyprint(true).print(root);
+ if (!out.toString().contains("http://schemas.xmlsoap.org/wsdl/"))
+ {
+ throw new WebServiceException("Not a wsdl");
+ }
}
catch (IOException ex)
{
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2009-09-29 16:25:45 UTC (rev 10792)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2009-09-29 17:22:33 UTC (rev 10793)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.ws.jaxws.samples.context;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URI;
import java.security.Principal;
import javax.annotation.Resource;
@@ -61,7 +63,7 @@
return "fail";
// Check standard jaxws properties
- InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
+ Object wsdl = msgContext.get(MessageContext.WSDL_DESCRIPTION);
QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
@@ -76,10 +78,24 @@
if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
throw new WebServiceException("Invalid qname: " + operation);
+
try
{
- Element root = DOMUtils.parse(wsdlSource);
- new DOMWriter(System.out).setPrettyprint(true).print(root);
+ Element root = null;
+ if (wsdl instanceof InputSource)
+ {
+ root = DOMUtils.parse((InputSource)wsdl);
+ }
+ else if (wsdl instanceof URI)
+ {
+ root = DOMUtils.parse(((URI)wsdl).toURL().openStream());
+ }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ new DOMWriter(out).setPrettyprint(true).print(root);
+ if (!out.toString().contains("http://schemas.xmlsoap.org/wsdl/"))
+ {
+ throw new WebServiceException("Not a wsdl");
+ }
}
catch (IOException ex)
{
15 years, 3 months