JBossWS SVN: r6766 - container/jboss50/branches/jbossws-jboss500.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-30 04:10:00 -0400 (Wed, 30 Apr 2008)
New Revision: 6766
Modified:
container/jboss50/branches/jbossws-jboss500/pom.xml
Log:
Remove dependency on jboss-as-component-matrix
Modified: container/jboss50/branches/jbossws-jboss500/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-04-30 08:08:09 UTC (rev 6765)
+++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-04-30 08:10:00 UTC (rev 6766)
@@ -17,9 +17,16 @@
<!-- Properties -->
<properties>
- <!-- Use this version and have a look at jbossws-jboss422 on how to declare the dependencies -->
- <!--jboss.version>5.0.0.Beta4</jboss.version-->
+ <!--
+ JBoss component versions taken from
+ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
+ -->
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.ejb3.version>0.1.0-SNAPSHOT</jboss.ejb3.version>
+ <jboss.deployers.version>2.0.0-SNAPSHOT</jboss.deployers.version>
+ <jboss.metadata.version>1.0.0.Beta10</jboss.metadata.version>
+ <jboss.security.version>2.0.2.Beta7</jboss.security.version>
+ <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>
</properties>
@@ -28,12 +35,50 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
+ <artifactId>jboss-as-server</artifactId>
<version>${jboss.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${jboss.metadata.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <version>${jboss.ejb3.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>${jboss.security.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.jbossxb.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -51,19 +96,16 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
</dependency>
<!-- jboss provided dependencies -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
- <version>${jboss.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,11 +124,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<scope>provided</scope>
17 years, 8 months
JBossWS SVN: r6765 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-30 04:08:09 -0400 (Wed, 30 Apr 2008)
New Revision: 6765
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2160][JBWS-2161] - updated excludes after CXF upgrade
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-30 08:07:46 UTC (rev 6764)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-30 08:08:09 UTC (rev 6765)
@@ -7,7 +7,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
@@ -33,6 +32,10 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+# [JBWS-2161] Investigate why LogicalHandlerJAXBTestCase and and HandlerChainTestCase tests fail
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -57,7 +60,6 @@
# [CXF-1515] Bad Enumeration value 'extension restriction'
org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1845/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-30 08:07:46 UTC (rev 6764)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-30 08:08:09 UTC (rev 6765)
@@ -7,7 +7,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
@@ -33,6 +32,10 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+# [JBWS-2161] Investigate why LogicalHandlerJAXBTestCase and and HandlerChainTestCase tests fail
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
@@ -57,7 +60,6 @@
# [CXF-1515] Bad Enumeration value 'extension restriction'
org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1845/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-30 08:07:46 UTC (rev 6764)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-30 08:08:09 UTC (rev 6765)
@@ -32,6 +32,10 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+# [JBWS-2161] Investigate why LogicalHandlerJAXBTestCase and and HandlerChainTestCase tests fail
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
# [JBWS-2107] Resolve dependency on @SecurityDomain
org/jboss/test/ws/jaxws/webserviceref/Secure**
org/jboss/test/ws/jaxws/jbws1840/**
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-30 08:07:46 UTC (rev 6764)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-30 08:08:09 UTC (rev 6765)
@@ -36,6 +36,10 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+# [JBWS-2161] Investigate why LogicalHandlerJAXBTestCase and and HandlerChainTestCase tests fail
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
17 years, 8 months
JBossWS SVN: r6764 - container/jboss50/branches/jbossws-jboss501.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-30 04:07:46 -0400 (Wed, 30 Apr 2008)
New Revision: 6764
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
Log:
Remove dependency on jboss-as-component-matrix
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-30 08:00:43 UTC (rev 6763)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-30 08:07:46 UTC (rev 6764)
@@ -17,7 +17,16 @@
<!-- Properties -->
<properties>
+ <!--
+ JBoss component versions taken from
+ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-ma...
+ -->
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jboss.ejb3.version>0.1.0-SNAPSHOT</jboss.ejb3.version>
+ <jboss.deployers.version>2.0.0-SNAPSHOT</jboss.deployers.version>
+ <jboss.metadata.version>1.0.0.Beta10</jboss.metadata.version>
+ <jboss.security.version>2.0.2.Beta7</jboss.security.version>
+ <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>
</properties>
@@ -26,12 +35,50 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
+ <artifactId>jboss-as-server</artifactId>
<version>${jboss.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${jboss.metadata.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <version>${jboss.ejb3.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <version>${jboss.security.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.jbossxb.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -49,19 +96,16 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
</dependency>
<!-- jboss provided dependencies -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
- <version>${jboss.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -80,11 +124,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<scope>provided</scope>
17 years, 8 months
JBossWS SVN: r6763 - framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-04-30 04:00:43 -0400 (Wed, 30 Apr 2008)
New Revision: 6763
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
Log:
Improving logging of project generator test
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-04-29 23:30:10 UTC (rev 6762)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-04-30 08:00:43 UTC (rev 6763)
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
@@ -167,13 +168,29 @@
return p;
}
- private void assertStatusCode(Process p, String error) throws InterruptedException
+ private void assertStatusCode(Process p, String error) throws Exception
{
// check status code
int status = p.waitFor();
+ if (p.exitValue() != 0)
+ {
+ printStream(p.getInputStream());
+ printStream(p.getErrorStream());
+ }
assertTrue(error, status == 0);
}
+ private void printStream(InputStream is) throws IOException
+ {
+ BufferedReader in = new BufferedReader(new InputStreamReader(is));
+ StringBuffer buffer = new StringBuffer();
+ String line;
+ while ((line = in.readLine()) != null) {
+ buffer.append(line + "\n");
+ }
+ System.out.println(buffer.toString() + "\n");
+ }
+
private boolean isDistroTest() throws Exception
{
File build = new File("../build.sh");
17 years, 8 months
JBossWS SVN: r6762 - in framework/trunk/hudson/hudson-home/jobs: Release-Matrix-Step1 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 19:30:10 -0400 (Tue, 29 Apr 2008)
New Revision: 6762
Removed:
framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/
Modified:
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
Log:
why would we want to delete the mvn repository?
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-04-29 23:30:10 UTC (rev 6762)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Maven-Repository-Clean, AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects>
+ <childProjects>AS-4.2.1, AS-4.2.2, AS-4.2.3, AS-5.0.0, AS-5.0.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
17 years, 8 months
JBossWS SVN: r6761 - in framework/trunk/hudson/hudson-home/jobs: Metro-Core-AS-4.2.3 and 10 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 19:26:54 -0400 (Tue, 29 Apr 2008)
New Revision: 6761
Modified:
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
Log:
switch metro to maven
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Core-AS-4.2.2
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss422
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -26,7 +26,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
+ant $ENVIRONMENT clean deploy-jboss422
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Core-AS-4.2.3
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss423
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -26,7 +26,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+ant $ENVIRONMENT clean deploy-jboss423
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Core-AS-5.0.0
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -26,7 +26,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Core-AS-5.0.1
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -26,7 +26,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
+ant $ENVIRONMENT clean deploy-jboss501
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Distro-AS-4.2.2
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss422
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -26,14 +26,13 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist
+ant $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
#
-cd output/jbossws-metro-dist
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT deploy-jboss422
+cd target/jbossws-metro-dist
+ant $ENVIRONMENT deploy-jboss422
#
# start jbossas
@@ -47,11 +46,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -65,7 +64,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/target/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Distro-AS-4.2.3
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss423
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -47,11 +47,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -65,7 +65,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/target/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Distro-AS-5.0.0
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -51,7 +51,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -65,7 +65,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/target/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Distro-AS-5.0.1
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -51,7 +51,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -65,7 +65,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/target/jbossws-metro-dist/output/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Integration-AS-4.2.2
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss422
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss422.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -22,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
+ant $ENVIRONMENT clean deploy-jboss422
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Integration-AS-4.2.3
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss423
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -22,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+ant $ENVIRONMENT clean deploy-jboss423
#
# start jbossas
@@ -40,11 +40,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
exit 1
fi
-
+
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Integration-AS-5.0.0
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss500
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -22,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
@@ -44,7 +44,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-04-29 20:32:37 UTC (rev 6760)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-04-29 23:26:54 UTC (rev 6761)
@@ -9,12 +9,12 @@
MODULE=Metro-Integration-AS-5.0.1
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
STACKMETRO=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss501
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -22,11 +22,11 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# build and deploy
+# build and deploy
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
+ant $ENVIRONMENT clean deploy-jboss501
#
# start jbossas
@@ -44,7 +44,7 @@
#
# execute tests
#
-./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log
+mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase clean test 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u
#
@@ -58,7 +58,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/test-reports/TEST-*.xml</testResults>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
17 years, 8 months
JBossWS SVN: r6760 - in stack/metro/trunk: modules and 109 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 16:32:37 -0400 (Tue, 29 Apr 2008)
New Revision: 6760
Added:
stack/metro/trunk/ant.properties.example
stack/metro/trunk/modules/
stack/metro/trunk/modules/client/
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/modules/client/src/
stack/metro/trunk/modules/client/src/main/
stack/metro/trunk/modules/client/src/main/java/
stack/metro/trunk/modules/client/src/main/java/org/
stack/metro/trunk/modules/client/src/main/java/org/jboss/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java
stack/metro/trunk/modules/client/src/main/resources/
stack/metro/trunk/modules/client/src/main/resources/META-INF/
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl
stack/metro/trunk/modules/management/
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/management/src/
stack/metro/trunk/modules/management/src/main/
stack/metro/trunk/modules/management/src/main/webapp/
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml
stack/metro/trunk/modules/management/src/main/webapp/index.html
stack/metro/trunk/modules/management/src/main/webapp/styles.css
stack/metro/trunk/modules/server/
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/
stack/metro/trunk/modules/server/src/main/
stack/metro/trunk/modules/server/src/main/java/
stack/metro/trunk/modules/server/src/main/java/org/
stack/metro/trunk/modules/server/src/main/java/org/jboss/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java
stack/metro/trunk/modules/server/src/main/resources/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
stack/metro/trunk/modules/server/src/main/scripts/
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/
stack/metro/trunk/modules/testsuite/framework-tests/
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/trunk/modules/testsuite/metro-tests/
stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/modules/wsit/
stack/metro/trunk/modules/wsit/pom.xml
stack/metro/trunk/modules/wsit/src/
stack/metro/trunk/modules/wsit/src/main/
stack/metro/trunk/modules/wsit/src/main/etc/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler
stack/metro/trunk/modules/wsit/src/main/scripts/
stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml
stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/distro/ant.properties
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/distro/jbossws-default-deploy.conf
stack/metro/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/metro/trunk/src/main/scripts/
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Removed:
stack/metro/trunk/Metro-Branch.ipr
stack/metro/trunk/ant-import-tests/
stack/metro/trunk/ant-import/
stack/metro/trunk/ant.properties.example
stack/metro/trunk/build.bat
stack/metro/trunk/build.sh
stack/metro/trunk/metro-trunk.iml
stack/metro/trunk/modules/client/
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/modules/client/src/
stack/metro/trunk/modules/client/src/main/
stack/metro/trunk/modules/client/src/main/java/
stack/metro/trunk/modules/client/src/main/java/org/
stack/metro/trunk/modules/client/src/main/java/org/jboss/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java
stack/metro/trunk/modules/client/src/main/resources/
stack/metro/trunk/modules/client/src/main/resources/META-INF/
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl
stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl
stack/metro/trunk/modules/management/
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/management/src/
stack/metro/trunk/modules/management/src/main/
stack/metro/trunk/modules/management/src/main/webapp/
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml
stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml
stack/metro/trunk/modules/management/src/main/webapp/index.html
stack/metro/trunk/modules/management/src/main/webapp/styles.css
stack/metro/trunk/modules/server/
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/
stack/metro/trunk/modules/server/src/main/
stack/metro/trunk/modules/server/src/main/java/
stack/metro/trunk/modules/server/src/main/java/org/
stack/metro/trunk/modules/server/src/main/java/org/jboss/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java
stack/metro/trunk/modules/server/src/main/resources/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
stack/metro/trunk/modules/server/src/main/scripts/
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/
stack/metro/trunk/modules/testsuite/framework-tests/
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/trunk/modules/testsuite/metro-tests/
stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/modules/wsit/
stack/metro/trunk/modules/wsit/pom.xml
stack/metro/trunk/modules/wsit/src/
stack/metro/trunk/modules/wsit/src/main/
stack/metro/trunk/modules/wsit/src/main/etc/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/
stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler
stack/metro/trunk/modules/wsit/src/main/scripts/
stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml
stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/bin-dist-build.xml
stack/metro/trunk/src/main/java/
stack/metro/trunk/src/main/resources/
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/metro/trunk/src/test/
stack/metro/trunk/tools/
stack/metro/trunk/version.properties
Modified:
stack/metro/trunk/
stack/metro/trunk/.classpath
stack/metro/trunk/.project
stack/metro/trunk/build.xml
stack/metro/trunk/src/
Log:
Switch to maven build
Property changes on: stack/metro/trunk
___________________________________________________________________
Name: svn:ignore
- output
version.properties.md5
thirdparty
ant.properties
glassfish-metro
+ .settings
target
ant.properties
target.properties
Modified: stack/metro/trunk/.classpath
===================================================================
--- stack/metro/trunk/.classpath 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/.classpath 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,28 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="modules/testsuite/metro-tests/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 kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/>
- <classpathentry kind="lib" path="thirdparty/http.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/>
- <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
- <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/>
- <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/junit.jar"/>
- <classpathentry kind="output" path="output/eclipse"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: stack/metro/trunk/.project
===================================================================
--- stack/metro/trunk/.project 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/.project 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>stack-metro</name>
+ <name>stack-metro-mvn</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Deleted: stack/metro/trunk/Metro-Branch.ipr
===================================================================
--- stack/metro/trunk/Metro-Branch.ipr 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/Metro-Branch.ipr 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
- <component name="AntConfiguration">
- <defaultAnt bundledAnt="true" />
- </component>
- <component name="BuildJarProjectSettings">
- <option name="BUILD_JARS_ON_MAKE" value="false" />
- </component>
- <component name="CodeStyleProjectProfileManger">
- <option name="PROJECT_PROFILE" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- </component>
- <component name="CodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS" />
- <option name="USE_PER_PROJECT_SETTINGS" value="false" />
- </component>
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
- <resourceExtensions>
- <entry name=".+\.(properties|xml|html|dtd|tld)" />
- <entry name=".+\.(gif|png|jpeg|jpg)" />
- </resourceExtensions>
- <wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- <entry name="?*.html" />
- <entry name="?*.dtd" />
- <entry name="?*.tld" />
- </wildcardResourcePatterns>
- </component>
- <component name="DataSourceManagerImpl" />
- <component name="DependenciesAnalyzeManager">
- <option name="myForwardDirection" value="false" />
- </component>
- <component name="DependencyValidationManager" />
- <component name="EclipseCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="true" />
- <option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="EclipseEmbeddedCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="true" />
- <option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="EntryPointsManager">
- <entry_points />
- </component>
- <component name="ExportToHTMLSettings">
- <option name="PRINT_LINE_NUMBERS" value="false" />
- <option name="OPEN_IN_BROWSER" value="false" />
- <option name="OUTPUT_DIRECTORY" />
- </component>
- <component name="GUI Designer component loader factory" />
- <component name="IdProvider" IDEtalkID="130CB95840D679D1651689A38EB02B70" />
- <component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
- <profiles>
- <profile version="1.0" is_locked="false">
- <option name="myName" value="Project Default" />
- <option name="myLocal" value="false" />
- <used_levels>
- <error>
- <option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
- </error>
- <warning>
- <option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
- </warning>
- <information>
- <option name="myName" value="INFO" />
- <option name="myVal" value="200" />
- </information>
- <server>
- <option name="myName" value="SERVER PROBLEM" />
- <option name="myVal" value="100" />
- </server>
- </used_levels>
- </profile>
- </profiles>
- </component>
- <component name="JavacSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
- <component name="JavadocGenerationManager">
- <option name="OUTPUT_DIRECTORY" />
- <option name="OPTION_SCOPE" value="protected" />
- <option name="OPTION_HIERARCHY" value="true" />
- <option name="OPTION_NAVIGATOR" value="true" />
- <option name="OPTION_INDEX" value="true" />
- <option name="OPTION_SEPARATE_INDEX" value="true" />
- <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
- <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
- <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
- <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
- <option name="OPTION_DEPRECATED_LIST" value="true" />
- <option name="OTHER_OPTIONS" value="" />
- <option name="HEAP_SIZE" />
- <option name="LOCALE" />
- <option name="OPEN_IN_BROWSER" value="true" />
- </component>
- <component name="JikesSettings">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="LogConsolePreferences">
- <option name="FILTER_ERRORS" value="false" />
- <option name="FILTER_WARNINGS" value="false" />
- <option name="FILTER_INFO" value="true" />
- <option name="CUSTOM_FILTER" />
- </component>
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/Metro-Branch.iml" filepath="$PROJECT_DIR$/Metro-Branch.iml" />
- <module fileurl="file://$PROJECT_DIR$/cvs/cvs-metro.iml" filepath="$PROJECT_DIR$/cvs/cvs-metro.iml" />
- <module fileurl="file://$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-2.1.2/jaxws-2.1.2.iml" />
- <module fileurl="file://$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" filepath="$PROJECT_DIR$/jaxws-tools-2.1.2/jaxws-tools-2.1.2.iml" />
- </modules>
- </component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/classes" />
- </component>
- <component name="ProjectRunConfigurationManager" />
- <component name="RmicSettings">
- <option name="IS_EANABLED" value="false" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
- <component name="StarteamVcsAdapter" />
- <component name="VssVcs" />
- <component name="com.intellij.jsf.UserDefinedFacesConfigs">
- <option name="USER_DEFINED_CONFIGS">
- <value>
- <list size="0" />
- </value>
- </option>
- </component>
- <component name="libraryTable" />
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
- </component>
- <UsedPathMacros />
-</project>
-
Deleted: stack/metro/trunk/ant.properties.example
===================================================================
--- stack/metro/trunk/ant.properties.example 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/ant.properties.example 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,57 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# Optional JBoss Home
-#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
-#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
-#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
-#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Endpoint servlet used by test descriptors
-endpoint.servlet=org.jboss.wsf.stack.metro.EndpointServlet
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
-
-# Metro CVS access
-#
-# Go to the WSIT Membership page
-# https://wsit.dev.java.net/servlets/ProjectMemberList
-#
-# Login or register for an account. If you already have a java.net account, you may need to request additional permissions.
-# https://wsit.dev.java.net/servlets/ProjectMembershipRequest
-#
-# Login to CVS
-# cvs -d :pserver:yourid@cvs.dev.java.net:/cvs login
-#
-cvs.user=guest
Copied: stack/metro/trunk/ant.properties.example (from rev 6759, stack/metro/branches/tdiesler/trunk/ant.properties.example)
===================================================================
--- stack/metro/trunk/ant.properties.example (rev 0)
+++ stack/metro/trunk/ant.properties.example 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,17 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBossWS Release
+jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
Deleted: stack/metro/trunk/build.bat
===================================================================
--- stack/metro/trunk/build.bat 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/build.bat 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,101 +0,0 @@
-@echo off
-
-REM ======================================================================
-REM
-REM This is the main entry point for the build system.
-REM
-REM Users should be sure to execute this file rather than 'ant' to ensure
-REM the correct version is being used with the correct configuration.
-REM
-REM ======================================================================
-REM
-REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $
-
-REM ******************************************************
-REM Ignore the ANT_HOME variable: we want to use *our*
-REM ANT version and associated JARs.
-REM ******************************************************
-REM Ignore the users classpath, cause it might mess
-REM things up
-REM ******************************************************
-
-SETLOCAL
-
-set NOPAUSE=true
-set CLASSPATH=
-set ANT_HOME=
-
-set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat
-
-REM
-REM - "for" loops have been unrolled for compatibility
-REM with some WIN32 systems.
-REM ******************************************************
-
-set NAMES=tools\ant
-set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
-
-REM ******************************************************
-REM ********Save the command line arguments***************
-REM ******************************************************
-set BUILD_ARGS=%1
-if ""%1""=="""" goto completedArgs
-shift
-:processArg
-if ""%1""=="""" goto completedArgs
-set BUILD_ARGS=%BUILD_ARGS% %1
-shift
-goto processArg
-
-:completedArgs
-
-REM ******************************************************
-REM ******************************************************
-
-SET EXECUTED=FALSE
-for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ********* Search for names in the subfolders *********
-REM ******************************************************
-
-:subLoop
-for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************ Test if ANT Batch file exists ***********
-REM ******************************************************
-
-:testIfExists
-if exist %1 call :BatchFound %1 %BUILD_ARGS%
-
-goto :EOF
-
-REM ******************************************************
-REM ************** Batch file has been found *************
-REM ******************************************************
-
-:BatchFound
-if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS%
-set EXECUTED=TRUE
-
-goto :EOF
-
-REM ******************************************************
-REM ************* Execute Batch file only once ***********
-REM ******************************************************
-
-:ExecuteBatch
-echo Calling %1 %BUILD_ARGS%
-
-REM set ENDORSED=
-call %1 %BUILD_ARGS%
-
-:end
-
-if "%NOPAUSE%" == "" pause
-
Deleted: stack/metro/trunk/build.sh
===================================================================
--- stack/metro/trunk/build.sh 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/build.sh 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,169 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## This is the main entry point for the build system. ##
-## ##
-## Users should be sure to execute this file rather than 'ant' to ensure ##
-## the correct version is being used with the correct configuration. ##
-## ##
-## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
-## ##
-### ====================================================================== ###
-
-# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-GREP="grep"
-ROOT="/"
-
-# Ignore user's ANT_HOME if it is set
-ANT_HOME=""
-
-# the default search path for ant
-ANT_SEARCH_PATH="tools/ant"
-
-# the default build file name
-ANT_BUILD_FILE="build.xml"
-
-# the default arguments
-ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-esac
-
-#
-# Helper to complain.
-#
-die() {
- echo "${PROGNAME}: $*"
- exit 1
-}
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to source a file if it exists.
-#
-maybe_source() {
- for file in $*; do
- if [ -f "$file" ]; then
- . $file
- fi
- done
-}
-
-search() {
- search="$*"
- for d in $search; do
- ANT_HOME="`pwd`/$d"
- ANT="$ANT_HOME/bin/ant"
- if [ -x "$ANT" ]; then
- # found one
- echo $ANT_HOME
- break
- fi
- done
-}
-
-#
-# Main function.
-#
-main() {
- # if there is a build config file. then source it
- maybe_source "$DIRNAME/build.conf"
-
- # Increase the maximum file descriptors if we can
- if [ $cygwin = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
- fi
-
- # try the search path
- ANT_HOME=`search $ANT_SEARCH_PATH`
-
- # try looking up to root
- if [ "x$ANT_HOME" = "x" ]; then
- target="build"
- _cwd=`pwd`
-
- while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
- cd ..
- cwd=`pwd`
- ANT_HOME=`search $ANT_SEARCH_PATH`
- done
-
- # make sure we get back
- cd $_cwd
-
- if [ "$cwd" != "$ROOT" ]; then
- found="true"
- fi
-
- # complain if we did not find anything
- if [ "$found" != "true" ]; then
- die "Could not locate Ant; check \$ANT or \$ANT_HOME."
- fi
- fi
-
- # make sure we have one
- ANT=$ANT_HOME/bin/ant
- if [ ! -x "$ANT" ]; then
- die "Ant file is not executable: $ANT"
- fi
-
- # Set the max memory to 256m
- ANT_OPTS=-Xmx256m
-
- # Endorse JAXB, JAXWS API
- ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed"
-
- # setup some build properties
- ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
-
- # change to the directory where the script lives so users are not forced
- # to be in the same directory as build.xml
- cd $DIRNAME
-
- # export some stuff for ant
- export ANT ANT_HOME ANT_OPTS
-
- # run ant
- $ANT $ANT_OPTIONS "$@"
-}
-
-##
-## Bootstrap
-##
-
-main "$@"
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/build.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -11,247 +11,68 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS-Metro">
+<project basedir="." name="JBossWS-Metro">
- <property name="stack.dir" value="${basedir}"/>
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
-
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
+
+ <property name="stack.dir" value="${basedir}"/>
+ <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/>
+ <property name="stack.output.dir" value="${stack.dir}/target"/>
+ <property name="stack.modules.dir" value="${stack.dir}/modules"/>
+ <property name="stack.management.dir" value="${stack.modules.dir}/management"/>
+ <property name="stack.client.dir" value="${stack.modules.dir}/client"/>
+ <property name="stack.server.dir" value="${stack.modules.dir}/server"/>
- <property name="stack.src.dir" value="${stack.dir}/src/main"/>
- <property name="stack.distro.dir" value="${stack.src.dir}/distro"/>
- <property name="stack.etc.dir" value="${stack.src.dir}/etc"/>
- <property name="stack.java.dir" value="${stack.src.dir}/java"/>
- <property name="stack.resources.dir" value="${stack.src.dir}/resources"/>
- <property name="stack.output.dir" value="${stack.dir}/output"/>
- <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/>
- <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/>
- <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/>
- <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/>
- <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/>
- <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/>
+ <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
- <property name="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/>
+ <import file="${stack.distro.dir}/build-setup.xml"/>
+ <import file="${stack.distro.dir}/build-deploy.xml"/>
+ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="prepare,thirdparty">
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-metro"/>
- <target name="compile-classes-metro" depends="init">
- <mkdir dir="${stack.output.classes.dir}"/>
- <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/metro/**"/>
- <classpath refid="stack.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${stack.output.etc.dir}"/>
- <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${stack.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
-
- <!-- Compile resource files -->
- <target name="compile42-resources">
+ <target name="init" depends="prepare">
+ <xmlproperty file="${stack.dir}/pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
-
- <!-- Concat jbossws-jboss422-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
- <target name="compile50-resources">
-
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
-
- <!-- Concat jbossws-jboss500-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
-
- <copy todir="${stack.output.resources.dir}">
- <fileset dir="${stack.resources.dir}">
- <include name="jbossws-metro.jar/**"/>
- <include name="jbossws-stack.sar/**"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
- <!-- Archives -->
+ <!-- Distribution -->
<!-- ================================================================== -->
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile" description="Builds all jar files.">
+ <target name="prepare-deploy" depends="prepare">
- <!-- Build jbossws-metro.jar -->
- <mkdir dir="${stack.output.lib.dir}"/>
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/injection/**"/>
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/metadata/**"/>
- <include name="org/jboss/wsf/stack/metro/log/**"/>
- <include name="org/jboss/wsf/stack/metro/*"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/>
- </jar>
-
- <!-- jbossws-metro-client.jar -->
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/tools/**"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${stack.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip">
- <fileset dir="${stack.java.dir}"/>
- </zip>
+ <delete dir="${deploy.artifacts.dir}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="package"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+ <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution">
- <!-- expand the metro sources -->
- <mkdir dir="${stack.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/>
+ <echo message="*************************************"/>
+ <echo message="* mvn -P bindist assembly:directory *"/>
+ <echo message="*************************************"/>
- <mkdir dir="${stack.output.apidocs.dir}"/>
- <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${stack.integration.classpath}"/>
- </classpath>
-
- <packageset dir="${stack.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${stack.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="com/sun/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]>
- </doctitle>
- <tag name="todo" scope="all" description="To do:"/>
-
-
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
-
- </javadoc>
+ <delete dir="${stack.output.dir}/jbossws-metro-dist"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-P bindist"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
<!-- ================================================================== -->
@@ -259,17 +80,14 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${stack.output.dir}"/>
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
</target>
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${stack.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
-
</project>
Deleted: stack/metro/trunk/metro-trunk.iml
===================================================================
--- stack/metro/trunk/metro-trunk.iml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/metro-trunk.iml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/jaxws-src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr250-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/sjsxp.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr173_api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/FastInfoset.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module" module-name="framework" />
- <orderEntry type="module" module-name="spi" />
- <orderEntryProperties />
- </component>
-</module>
-
Copied: stack/metro/trunk/modules (from rev 6759, stack/metro/branches/tdiesler/trunk/modules)
Copied: stack/metro/trunk/modules/client (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client)
Property changes on: stack/metro/trunk/modules/client
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,101 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Runtime Client</name>
- <artifactId>jbossws-metro-client</artifactId>
- <packaging>jar</packaging>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
-
- <!-- jbossws dependencies -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
-
- <!-- Metro dependencies -->
- <dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>http</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-local-transport</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr173_api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr181-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>resolver</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>txnannprocessor</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xmldsig</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xmlsec</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xws-security</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-lgpl</artifactId>
- </dependency>
-
- <!-- jboss provided -->
- <dependency>
- <groupId>jboss.common</groupId>
- <artifactId>jboss-common</artifactId>
- </dependency>
- </dependencies>
-
-</project>
Copied: stack/metro/trunk/modules/client/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/pom.xml)
===================================================================
--- stack/metro/trunk/modules/client/pom.xml (rev 0)
+++ stack/metro/trunk/modules/client/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,101 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Runtime Client</name>
+ <artifactId>jbossws-metro-client</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+
+ <!-- Metro dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-local-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>txnannprocessor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmldsig</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xws-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ </dependency>
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Copied: stack/metro/trunk/modules/client/src (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src)
Copied: stack/metro/trunk/modules/client/src/main (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main)
Copied: stack/metro/trunk/modules/client/src/main/java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java)
Copied: stack/metro/trunk/modules/client/src/main/java/org (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org)
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss)
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf)
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack)
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro)
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client)
Deleted: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,217 +0,0 @@
-/*
- * 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.wsf.stack.metro.client;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
-/**
- * This ServiceObjectFactory reconstructs a javax.xml.ws.Service
- * for a given WSDL when the webservice client does a JNDI lookup
- *
- * @see ServiceReferenceable
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 12, 2007
- * */
-public class ServiceObjectFactory implements ObjectFactory
-{
- protected final Logger log = Logger.getLogger(ServiceObjectFactory.class);
-
- /**
- * Creates an object using the location or reference information specified.
- * <p/>
- *
- * @param obj The possibly null object containing location or reference
- * information that can be used in creating an object.
- * @param name The name of this object relative to <code>nameCtx</code>,
- * or null if no name is specified.
- * @param nameCtx The context relative to which the <code>name</code>
- * parameter is specified, or null if <code>name</code> is
- * relative to the default initial context.
- * @param environment The possibly null environment that is used in
- * creating the object.
- * @return The object created; null if an object cannot be created.
- * @throws Exception if this object factory encountered an exception
- * while attempting to create an object, and no other object factories are
- * to be tried.
- * @see javax.naming.spi.NamingManager#getObjectInstance
- * @see javax.naming.spi.NamingManager#getURLContext
- */
- public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
- {
- try
- {
- Reference ref = (Reference)obj;
-
- // Get the target class name
- String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent();
-
- // Unmarshall the UnifiedServiceRef
- UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref);
- String serviceRefName = serviceRef.getServiceRefName();
- QName serviceQName = serviceRef.getServiceQName();
-
- String serviceImplClass = serviceRef.getServiceImplClass();
- if (serviceImplClass == null)
- serviceImplClass = (String)ref.get(ServiceReferenceable.SERVICE_IMPL_CLASS).getContent();
-
- // If the target defaults to javax.xml.ws.Service, use the service as the target
- if (Service.class.getName().equals(targetClassName))
- targetClassName = serviceImplClass;
-
- log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]");
-
- // Load the service class
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- Class serviceClass = ctxLoader.loadClass(serviceImplClass);
- Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null);
-
- if (Service.class.isAssignableFrom(serviceClass) == false)
- throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service");
-
- // Receives either a javax.xml.ws.Service or a dynamic proxy
- Object target;
-
- // Get the URL to the wsdl
- URL wsdlURL = serviceRef.getWsdlLocation();
-
- // Generic javax.xml.ws.Service
- if (serviceClass == Service.class)
- {
- if (wsdlURL != null)
- {
- target = Service.create(wsdlURL, serviceQName);
- }
- else
- {
- throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName);
- }
- }
- // Generated javax.xml.ws.Service subclass
- else
- {
- if (wsdlURL != null)
- {
- Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class });
- target = ctor.newInstance(new Object[] { wsdlURL, serviceQName });
- }
- else
- {
- target = (Service)serviceClass.newInstance();
- }
- }
-
- // Configure the service
- configureService((Service)target, serviceRef);
-
- if (targetClassName != null && targetClassName.equals(serviceImplClass) == false)
- {
- try
- {
- Object port = null;
- if (serviceClass != Service.class)
- {
- for (Method method : serviceClass.getDeclaredMethods())
- {
- String methodName = method.getName();
- Class retType = method.getReturnType();
- if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
- {
- port = method.invoke(target, new Object[0]);
- target = port;
- break;
- }
- }
- }
-
- if (port == null)
- {
- Method method = serviceClass.getMethod("getPort", new Class[] { Class.class });
- port = method.invoke(target, new Object[] { targetClass });
- target = port;
- }
- }
- catch (InvocationTargetException ex)
- {
- throw ex.getTargetException();
- }
- }
-
- return target;
- }
- catch (Throwable ex)
- {
- WSFException.rethrow("Cannot create service", ex);
- return null;
- }
- }
-
- private void configureService(Service service, UnifiedServiceRefMetaData serviceRef)
- {
- log.warn("Service configuration not available in Sun-RI");
- }
-
- private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException
- {
- UnifiedServiceRefMetaData sref;
- RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA);
- ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent());
- try
- {
- ObjectInputStream ois = new ObjectInputStream(bais);
- sref = (UnifiedServiceRefMetaData)ois.readObject();
- ois.close();
- }
- catch (IOException e)
- {
- throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString());
- }
-
- // WebServiceException: null is not a valid service
- // http://jira.jboss.org/jira/browse/JBWS-2130
- if (sref.getServiceQName() == null)
- throw new IllegalArgumentException("ServiceQName may not be null. "
- + "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation.");
-
- return sref;
- }
-}
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java)
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,217 @@
+/*
+ * 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.wsf.stack.metro.client;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.spi.ObjectFactory;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+/**
+ * This ServiceObjectFactory reconstructs a javax.xml.ws.Service
+ * for a given WSDL when the webservice client does a JNDI lookup
+ *
+ * @see ServiceReferenceable
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 12, 2007
+ * */
+public class ServiceObjectFactory implements ObjectFactory
+{
+ protected final Logger log = Logger.getLogger(ServiceObjectFactory.class);
+
+ /**
+ * Creates an object using the location or reference information specified.
+ * <p/>
+ *
+ * @param obj The possibly null object containing location or reference
+ * information that can be used in creating an object.
+ * @param name The name of this object relative to <code>nameCtx</code>,
+ * or null if no name is specified.
+ * @param nameCtx The context relative to which the <code>name</code>
+ * parameter is specified, or null if <code>name</code> is
+ * relative to the default initial context.
+ * @param environment The possibly null environment that is used in
+ * creating the object.
+ * @return The object created; null if an object cannot be created.
+ * @throws Exception if this object factory encountered an exception
+ * while attempting to create an object, and no other object factories are
+ * to be tried.
+ * @see javax.naming.spi.NamingManager#getObjectInstance
+ * @see javax.naming.spi.NamingManager#getURLContext
+ */
+ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
+ {
+ try
+ {
+ Reference ref = (Reference)obj;
+
+ // Get the target class name
+ String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent();
+
+ // Unmarshall the UnifiedServiceRef
+ UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref);
+ String serviceRefName = serviceRef.getServiceRefName();
+ QName serviceQName = serviceRef.getServiceQName();
+
+ String serviceImplClass = serviceRef.getServiceImplClass();
+ if (serviceImplClass == null)
+ serviceImplClass = (String)ref.get(ServiceReferenceable.SERVICE_IMPL_CLASS).getContent();
+
+ // If the target defaults to javax.xml.ws.Service, use the service as the target
+ if (Service.class.getName().equals(targetClassName))
+ targetClassName = serviceImplClass;
+
+ log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]");
+
+ // Load the service class
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ Class serviceClass = ctxLoader.loadClass(serviceImplClass);
+ Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null);
+
+ if (Service.class.isAssignableFrom(serviceClass) == false)
+ throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service");
+
+ // Receives either a javax.xml.ws.Service or a dynamic proxy
+ Object target;
+
+ // Get the URL to the wsdl
+ URL wsdlURL = serviceRef.getWsdlLocation();
+
+ // Generic javax.xml.ws.Service
+ if (serviceClass == Service.class)
+ {
+ if (wsdlURL != null)
+ {
+ target = Service.create(wsdlURL, serviceQName);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName);
+ }
+ }
+ // Generated javax.xml.ws.Service subclass
+ else
+ {
+ if (wsdlURL != null)
+ {
+ Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class });
+ target = ctor.newInstance(new Object[] { wsdlURL, serviceQName });
+ }
+ else
+ {
+ target = (Service)serviceClass.newInstance();
+ }
+ }
+
+ // Configure the service
+ configureService((Service)target, serviceRef);
+
+ if (targetClassName != null && targetClassName.equals(serviceImplClass) == false)
+ {
+ try
+ {
+ Object port = null;
+ if (serviceClass != Service.class)
+ {
+ for (Method method : serviceClass.getDeclaredMethods())
+ {
+ String methodName = method.getName();
+ Class retType = method.getReturnType();
+ if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
+ {
+ port = method.invoke(target, new Object[0]);
+ target = port;
+ break;
+ }
+ }
+ }
+
+ if (port == null)
+ {
+ Method method = serviceClass.getMethod("getPort", new Class[] { Class.class });
+ port = method.invoke(target, new Object[] { targetClass });
+ target = port;
+ }
+ }
+ catch (InvocationTargetException ex)
+ {
+ throw ex.getTargetException();
+ }
+ }
+
+ return target;
+ }
+ catch (Throwable ex)
+ {
+ WSFException.rethrow("Cannot create service", ex);
+ return null;
+ }
+ }
+
+ private void configureService(Service service, UnifiedServiceRefMetaData serviceRef)
+ {
+ log.warn("Service configuration not available in Sun-RI");
+ }
+
+ private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException
+ {
+ UnifiedServiceRefMetaData sref;
+ RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA);
+ ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent());
+ try
+ {
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ sref = (UnifiedServiceRefMetaData)ois.readObject();
+ ois.close();
+ }
+ catch (IOException e)
+ {
+ throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString());
+ }
+
+ // WebServiceException: null is not a valid service
+ // http://jira.jboss.org/jira/browse/JBWS-2130
+ if (sref.getServiceQName() == null)
+ throw new IllegalArgumentException("ServiceQName may not be null. "
+ + "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation.");
+
+ return sref;
+ }
+}
Deleted: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,42 +0,0 @@
-/*
- * 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.wsf.stack.metro.client;
-
-// $Id$
-
-import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
-
-/**
- * Binds a JAXWS Service object in the client's ENC
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 17-Jan-2007
- */
-public class ServiceRefBinderFactoryImpl implements ServiceRefBinderFactory
-{
- public ServiceRefBinder newServiceRefBinder(Type type)
- {
- return (type == Type.JAXRPC ? new ServiceRefBinderJAXRPC() : new ServiceRefBinderJAXWS());
- }
-}
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java)
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,42 @@
+/*
+ * 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.wsf.stack.metro.client;
+
+// $Id$
+
+import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
+import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
+
+/**
+ * Binds a JAXWS Service object in the client's ENC
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 17-Jan-2007
+ */
+public class ServiceRefBinderFactoryImpl implements ServiceRefBinderFactory
+{
+ public ServiceRefBinder newServiceRefBinder(Type type)
+ {
+ return (type == Type.JAXRPC ? new ServiceRefBinderJAXRPC() : new ServiceRefBinderJAXWS());
+ }
+}
Deleted: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,42 +0,0 @@
-/*
- * 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.wsf.stack.metro.client;
-
-import java.lang.reflect.AnnotatedElement;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 12, 2007
- */
-public class ServiceRefBinderJAXRPC implements ServiceRefBinder
-{
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
- {
- throw new IllegalArgumentException("Deployed stack doesnt support JAX-RPC service-ref deployments");
- }
-}
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java)
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXRPC.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,42 @@
+/*
+ * 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.wsf.stack.metro.client;
+
+import java.lang.reflect.AnnotatedElement;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 12, 2007
+ */
+public class ServiceRefBinderJAXRPC implements ServiceRefBinder
+{
+ public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException
+ {
+ throw new IllegalArgumentException("Deployed stack doesnt support JAX-RPC service-ref deployments");
+ }
+}
Deleted: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,221 +0,0 @@
-/*
- * 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.wsf.stack.metro.client;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.HandlerChain;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.Referenceable;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.WebServiceRefs;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.naming.Util;
-import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 12, 2007
- */
-public class ServiceRefBinderJAXWS implements ServiceRefBinder
-{
- // logging support
- private static Logger log = Logger.getLogger(ServiceRefBinderJAXWS.class);
-
- public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
- throws NamingException
- {
- WebServiceRef wsref = null;
-
- if (null == loader)
- throw new IllegalArgumentException("There needs to be a classloader available");
-
- // Build the list of @WebServiceRef relevant annotations
- List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>();
-
- if (anElement != null)
- {
- for (Annotation an : anElement.getAnnotations())
- {
- if (an instanceof WebServiceRef)
- wsrefList.add((WebServiceRef)an);
-
- if (an instanceof WebServiceRefs)
- {
- WebServiceRefs wsrefs = (WebServiceRefs)an;
- for (WebServiceRef aux : wsrefs.value())
- wsrefList.add(aux);
- }
- }
- }
-
- // Use the single @WebServiceRef
- if (wsrefList.size() == 1)
- {
- wsref = wsrefList.get(0);
- }
- else
- {
- for (WebServiceRef aux : wsrefList)
- {
- if (encName.endsWith("/" + aux.name()))
- {
- wsref = aux;
- break;
- }
- }
- }
-
- Class targetClass = null;
- if (anElement instanceof Field)
- {
- targetClass = ((Field)anElement).getType();
- }
- else if (anElement instanceof Method)
- {
- targetClass = ((Method)anElement).getParameterTypes()[0];
- }
- else
- {
- if (wsref != null && (wsref.type() != Object.class))
- targetClass = wsref.type();
- }
-
- String targetClassName = (targetClass != null ? targetClass.getName() : null);
- String externalName = encCtx.getNameInNamespace() + "/" + encName;
- log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]");
-
- String serviceImplClass = null;
-
- // #1 Use the explicit @WebServiceRef.value
- if (wsref != null && wsref.value() != Object.class)
- serviceImplClass = wsref.value().getName();
-
- // #2 Use the target ref type
- if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass))
- serviceImplClass = targetClass.getName();
-
- // #3 Use <service-interface>
- if (serviceImplClass == null && serviceRef.getServiceInterface() != null)
- serviceImplClass = serviceRef.getServiceInterface();
-
- // #4 Use javax.xml.ws.Service
- if (serviceImplClass == null)
- serviceImplClass = Service.class.getName();
-
- // #1 Use the explicit @WebServiceRef.type
- if (wsref != null && wsref.type() != Object.class)
- targetClassName = wsref.type().getName();
-
- // #2 Use the target ref type
- if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false)
- targetClassName = targetClass.getName();
-
- // Set the wsdlLocation if there is no override already
- if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0)
- serviceRef.setWsdlOverride(wsref.wsdlLocation());
-
- // Set the handlerChain from @HandlerChain on the annotated element
- String handlerChain = serviceRef.getHandlerChain();
- if (anElement != null)
- {
- HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class);
- if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0)
- handlerChain = anHandlerChain.file();
- }
-
- // Resolve path to handler chain
- if (handlerChain != null)
- {
- try
- {
- new URL(handlerChain);
- }
- catch (MalformedURLException ex)
- {
- Class declaringClass = null;
- if (anElement instanceof Field)
- declaringClass = ((Field)anElement).getDeclaringClass();
- else if (anElement instanceof Method)
- declaringClass = ((Method)anElement).getDeclaringClass();
- else if (anElement instanceof Class)
- declaringClass = (Class)anElement;
-
- handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
- }
-
- serviceRef.setHandlerChain(handlerChain);
- }
-
- // Extract service QName for target service
- if (null == serviceRef.getServiceQName())
- {
- try
- {
- Class serviceClass = loader.loadClass(serviceImplClass);
- if (serviceClass.getAnnotation(WebServiceClient.class) != null)
- {
- WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class);
- serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name()));
- }
- }
- catch (ClassNotFoundException e)
- {
- WSFException.rethrow("Cannot extract service QName for target service", e);
- }
- }
-
- // Do not use rebind, the binding should be unique
- // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind
- Referenceable serviceReferenceable = buildServiceReferenceable(serviceImplClass, targetClassName, serviceRef);
- Util.bind(encCtx, encName, serviceReferenceable);
-
- }
-
- /**
- * Create a Sun-RI specific service referenceable.
- * Most of the setup is done in {@link org.jboss.wsf.framework.serviceref.ServiceRefBinderJAXWS}
- *
- * @param serviceImplClass
- * @param targetClassName
- * @param serviceRef
- * @return a Sun-RI specific service referenceable.
- */
- protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef)
- {
- return new ServiceReferenceable(serviceImplClass, targetClassName, serviceRef);
- }
-}
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java)
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderJAXWS.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,221 @@
+/*
+ * 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.wsf.stack.metro.client;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.HandlerChain;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.Referenceable;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.WebServiceRefs;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.naming.Util;
+import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 12, 2007
+ */
+public class ServiceRefBinderJAXWS implements ServiceRefBinder
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ServiceRefBinderJAXWS.class);
+
+ public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader)
+ throws NamingException
+ {
+ WebServiceRef wsref = null;
+
+ if (null == loader)
+ throw new IllegalArgumentException("There needs to be a classloader available");
+
+ // Build the list of @WebServiceRef relevant annotations
+ List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>();
+
+ if (anElement != null)
+ {
+ for (Annotation an : anElement.getAnnotations())
+ {
+ if (an instanceof WebServiceRef)
+ wsrefList.add((WebServiceRef)an);
+
+ if (an instanceof WebServiceRefs)
+ {
+ WebServiceRefs wsrefs = (WebServiceRefs)an;
+ for (WebServiceRef aux : wsrefs.value())
+ wsrefList.add(aux);
+ }
+ }
+ }
+
+ // Use the single @WebServiceRef
+ if (wsrefList.size() == 1)
+ {
+ wsref = wsrefList.get(0);
+ }
+ else
+ {
+ for (WebServiceRef aux : wsrefList)
+ {
+ if (encName.endsWith("/" + aux.name()))
+ {
+ wsref = aux;
+ break;
+ }
+ }
+ }
+
+ Class targetClass = null;
+ if (anElement instanceof Field)
+ {
+ targetClass = ((Field)anElement).getType();
+ }
+ else if (anElement instanceof Method)
+ {
+ targetClass = ((Method)anElement).getParameterTypes()[0];
+ }
+ else
+ {
+ if (wsref != null && (wsref.type() != Object.class))
+ targetClass = wsref.type();
+ }
+
+ String targetClassName = (targetClass != null ? targetClass.getName() : null);
+ String externalName = encCtx.getNameInNamespace() + "/" + encName;
+ log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]");
+
+ String serviceImplClass = null;
+
+ // #1 Use the explicit @WebServiceRef.value
+ if (wsref != null && wsref.value() != Object.class)
+ serviceImplClass = wsref.value().getName();
+
+ // #2 Use the target ref type
+ if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass))
+ serviceImplClass = targetClass.getName();
+
+ // #3 Use <service-interface>
+ if (serviceImplClass == null && serviceRef.getServiceInterface() != null)
+ serviceImplClass = serviceRef.getServiceInterface();
+
+ // #4 Use javax.xml.ws.Service
+ if (serviceImplClass == null)
+ serviceImplClass = Service.class.getName();
+
+ // #1 Use the explicit @WebServiceRef.type
+ if (wsref != null && wsref.type() != Object.class)
+ targetClassName = wsref.type().getName();
+
+ // #2 Use the target ref type
+ if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false)
+ targetClassName = targetClass.getName();
+
+ // Set the wsdlLocation if there is no override already
+ if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0)
+ serviceRef.setWsdlOverride(wsref.wsdlLocation());
+
+ // Set the handlerChain from @HandlerChain on the annotated element
+ String handlerChain = serviceRef.getHandlerChain();
+ if (anElement != null)
+ {
+ HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class);
+ if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0)
+ handlerChain = anHandlerChain.file();
+ }
+
+ // Resolve path to handler chain
+ if (handlerChain != null)
+ {
+ try
+ {
+ new URL(handlerChain);
+ }
+ catch (MalformedURLException ex)
+ {
+ Class declaringClass = null;
+ if (anElement instanceof Field)
+ declaringClass = ((Field)anElement).getDeclaringClass();
+ else if (anElement instanceof Method)
+ declaringClass = ((Method)anElement).getDeclaringClass();
+ else if (anElement instanceof Class)
+ declaringClass = (Class)anElement;
+
+ handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
+ }
+
+ serviceRef.setHandlerChain(handlerChain);
+ }
+
+ // Extract service QName for target service
+ if (null == serviceRef.getServiceQName())
+ {
+ try
+ {
+ Class serviceClass = loader.loadClass(serviceImplClass);
+ if (serviceClass.getAnnotation(WebServiceClient.class) != null)
+ {
+ WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class);
+ serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name()));
+ }
+ }
+ catch (ClassNotFoundException e)
+ {
+ WSFException.rethrow("Cannot extract service QName for target service", e);
+ }
+ }
+
+ // Do not use rebind, the binding should be unique
+ // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind
+ Referenceable serviceReferenceable = buildServiceReferenceable(serviceImplClass, targetClassName, serviceRef);
+ Util.bind(encCtx, encName, serviceReferenceable);
+
+ }
+
+ /**
+ * Create a Sun-RI specific service referenceable.
+ * Most of the setup is done in {@link org.jboss.wsf.framework.serviceref.ServiceRefBinderJAXWS}
+ *
+ * @param serviceImplClass
+ * @param targetClassName
+ * @param serviceRef
+ * @return a Sun-RI specific service referenceable.
+ */
+ protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef)
+ {
+ return new ServiceReferenceable(serviceImplClass, targetClassName, serviceRef);
+ }
+}
Deleted: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,88 +0,0 @@
-/*
- * 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.wsf.stack.metro.client;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
-import javax.naming.*;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.IOException;
-
-/**
- * A JNDI reference to a javax.xml.ws.Service
- *
- * It holds the information to reconstrut the javax.xml.ws.Service
- * when the client does a JNDI lookup.
- *
- * @author Heiko.Braun(a)jboss.com
- */
-public class ServiceReferenceable implements Referenceable
-{
- public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA";
- public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME";
- public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME";
-
- private String serviceImplClass;
- private String targetClassName;
- private UnifiedServiceRefMetaData serviceRef;
-
- public ServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef)
- {
- this.serviceImplClass = serviceImplClass;
- this.targetClassName = targetClassName;
- this.serviceRef = serviceRef;
- }
-
- /**
- * Retrieves the Reference of this object.
- *
- * @return The non-null Reference of this object.
- * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference.
- */
- public Reference getReference() throws NamingException
- {
- Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null);
-
- myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass));
- myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName));
- myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef)));
-
- return myRef;
- }
-
- private byte[] marshall(Object obj) throws NamingException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
- try
- {
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(obj);
- oos.close();
- }
- catch (IOException e)
- {
- throw new NamingException("Cannot marshall object, cause: " + e.toString());
- }
- return baos.toByteArray();
- }
-}
Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java)
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java (rev 0)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceReferenceable.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,88 @@
+/*
+ * 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.wsf.stack.metro.client;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+import javax.naming.*;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.IOException;
+
+/**
+ * A JNDI reference to a javax.xml.ws.Service
+ *
+ * It holds the information to reconstrut the javax.xml.ws.Service
+ * when the client does a JNDI lookup.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ */
+public class ServiceReferenceable implements Referenceable
+{
+ public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA";
+ public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME";
+ public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME";
+
+ private String serviceImplClass;
+ private String targetClassName;
+ private UnifiedServiceRefMetaData serviceRef;
+
+ public ServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef)
+ {
+ this.serviceImplClass = serviceImplClass;
+ this.targetClassName = targetClassName;
+ this.serviceRef = serviceRef;
+ }
+
+ /**
+ * Retrieves the Reference of this object.
+ *
+ * @return The non-null Reference of this object.
+ * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference.
+ */
+ public Reference getReference() throws NamingException
+ {
+ Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null);
+
+ myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass));
+ myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName));
+ myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef)));
+
+ return myRef;
+ }
+
+ private byte[] marshall(Object obj) throws NamingException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
+ try
+ {
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(obj);
+ oos.close();
+ }
+ catch (IOException e)
+ {
+ throw new NamingException("Cannot marshall object, cause: " + e.toString());
+ }
+ return baos.toByteArray();
+ }
+}
Copied: stack/metro/trunk/modules/client/src/main/resources (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources)
Copied: stack/metro/trunk/modules/client/src/main/resources/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF)
Copied: stack/metro/trunk/modules/client/src/main/resources/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services)
Deleted: stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.metro.tools.MetroConsumerFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl)
===================================================================
--- stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl (rev 0)
+++ stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.metro.tools.MetroConsumerFactoryImpl
\ No newline at end of file
Deleted: stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.metro.tools.MetroProviderFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl)
===================================================================
--- stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (rev 0)
+++ stack/metro/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.metro.tools.MetroProviderFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/management (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management)
Property changes on: stack/metro/trunk/modules/management
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/management/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,25 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Management</name>
- <artifactId>jbossws-metro-management</artifactId>
- <packaging>war</packaging>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: stack/metro/trunk/modules/management/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/pom.xml)
===================================================================
--- stack/metro/trunk/modules/management/pom.xml (rev 0)
+++ stack/metro/trunk/modules/management/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Management</name>
+ <artifactId>jbossws-metro-management</artifactId>
+ <packaging>war</packaging>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: stack/metro/trunk/modules/management/src (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src)
Copied: stack/metro/trunk/modules/management/src/main (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main)
Copied: stack/metro/trunk/modules/management/src/main/webapp (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp)
Copied: stack/metro/trunk/modules/management/src/main/webapp/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF)
Deleted: stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE jboss-web
- PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
-
-<jboss-web>
-
- <!--
- <security-domain>java:/jaas/jbossws</security-domain>
- -->
- <context-root>jbossws</context-root>
-
-</jboss-web>
Copied: stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml)
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!--
+ <security-domain>java:/jaas/jbossws</security-domain>
+ -->
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Deleted: stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- A web application that installs the JBossWS servlets
-
- $Id$
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>JBossWS</display-name>
-
- <servlet>
- <servlet-name>ContextServlet</servlet-name>
- <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
- </servlet>
-
- <!-- now the mappings -->
-
- <servlet-mapping>
- <servlet-name>ContextServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <!--
- currently the W3C haven't settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response
- -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
Copied: stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ A web application that installs the JBossWS servlets
+
+ $Id$
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+ <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Deleted: stack/metro/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/management/src/main/webapp/index.html 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,66 +0,0 @@
-<html><head>
-<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
-<title>JBossWS (@implementation.version@)</title>
-<link rel='stylesheet' href='./styles.css'>
-</head>
-<body>
-
-<div class='pageHeader'>JBossWS</div>
-
-<div class="pageSection">
-<h2>Welcome to JBoss Web Services</h2>
-JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering.
-</div>
-
-<div class="pageSection">
-<h3>Administration</h3>
-
-<fieldset>
- <legend><b>Runtime information</b></legend>
-<ul>
- <li><b>Revision: @implementation.version@</b></li>
- <li><b>Build: @build.id@</b></li>
- <li><a href="services">View a list of deployed services</a></li>
- <!--li><a href="depends">View installed dependencies</a></li-->
- <li><a href="/jmx-console/">Access JMX console</a></li>
-</ul>
-</fieldset>
-</div>
-
-<div class="pageSection">
-<h3>Project information</h3>
-
-<fieldset>
- <legend><b>Documentation</b></legend>
-
-<ul>
- <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li>
- <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li>
- <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li>
- <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li>
- <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Records_management">Records management</a></li>
-</ul>
-</fieldset>
-
-</br>
-<fieldset>
- <legend><b>Community</b></legend>
-<ul>
- <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=275">User forum</a></li>
- <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
- <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
-</ul>
-</fieldset>
-
-</br>
-<fieldset>
- <legend><b>Source repository</b></legend>
-<ul>
- <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Subversion">Subversion repository</a></li>
- <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
-</ul>
-</fieldset>
-</div>
-
-</body>
-</html>
Copied: stack/metro/trunk/modules/management/src/main/webapp/index.html (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html)
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/index.html (rev 0)
+++ stack/metro/trunk/modules/management/src/main/webapp/index.html 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,66 @@
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBossWS (@implementation.version@)</title>
+<link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class='pageHeader'>JBossWS</div>
+
+<div class="pageSection">
+<h2>Welcome to JBoss Web Services</h2>
+JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering.
+</div>
+
+<div class="pageSection">
+<h3>Administration</h3>
+
+<fieldset>
+ <legend><b>Runtime information</b></legend>
+<ul>
+ <li><b>Revision: @implementation.version@</b></li>
+ <li><b>Build: @build.id@</b></li>
+ <li><a href="services">View a list of deployed services</a></li>
+ <!--li><a href="depends">View installed dependencies</a></li-->
+ <li><a href="/jmx-console/">Access JMX console</a></li>
+</ul>
+</fieldset>
+</div>
+
+<div class="pageSection">
+<h3>Project information</h3>
+
+<fieldset>
+ <legend><b>Documentation</b></legend>
+
+<ul>
+ <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Records_management">Records management</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Community</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=275">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
+ <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Source repository</b></legend>
+<ul>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Subversion">Subversion repository</a></li>
+ <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
+</ul>
+</fieldset>
+</div>
+
+</body>
+</html>
Deleted: stack/metro/trunk/modules/management/src/main/webapp/styles.css
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/styles.css 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/management/src/main/webapp/styles.css 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,186 +0,0 @@
-
-/* table for list views */
-.table_list {
-}
-
-/* table for detail views */
-.table_form {
-}
-
-.pageHeader {
- font-size: 14pt;
- font-weight: BOLD;
- color: #ffffff;
- border-bottom-width:1px;
- border-bottom-style:solid;
- border-color:#000066;
- margin-bottom:15px;
- padding-left:15px;
- padding-top:5px;
- padding-bottom:5px;
- background-color: #3b4f66;
- max-width: 900px;
-}
-
-.pageSection {
- padding-left:15px;
- margin-bottom: 5px;
- max-width: 900px;
-}
-
-.metrics
-{
- font-size: 6pt;
- background-color: #dddddd;
- width: 100%;
-}
-
-/* table row header */
-.list_tr_head {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- font-weight: 600;
- text-align: center;
- background-color: #3b4f66;
-}
-
-/* table row list view */
-.list_tr {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #ffffff;
-}
-
-/* table row list view odd lines */
-.list_tr_even {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #ffffff;
-}
-
-/* table row list view even lines */
-.list_tr_odd {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #dddddd;
-}
-
-/* form label */
-.form_label {
- font-family: Verdana, sans-serif;
- font-weight: 500;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #dddddd;
- padding-top: 2px;
- padding-bottom: 2px;
-}
-
-/* form value */
-.form_value {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: baseline;
-}
-
-/* tiny writing */
-.tiny {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #666666;
-}
-
-/* required input fields */
-.inputmust {
- background-color: #dddddd;
-}
-
-/* error message */
-.error {
- font-family: Courier New;
- color: #990000;
-}
-
-/* error message */
-.error_trace {
- font-family: Courier New;
-}
-
-/* active tree node */
-.tree_active_label {
- font-weight: bold;
-}
-
-body {
- font-family: Verdana,, sans-serif;
- font-size: 8pt;
- color: #000066;
- background-color: #ffffff;
-}
-
-/* title style */
-h1 {
- font-family: Verdana, sans-serif;
- font-size: 14pt;
- font-weight: 600;
- color: #000066;
-}
-
-h2 {
- font-family: Verdana, sans-serif;
- font-size: 12pt;
- font-weight: 600;
- color: #000066;
-}
-
-h3 {
- font-family: Verdana, sans-serif;
- font-size: 10pt;
- font-weight: 600;
- color: #000066;
-}
-
-h4 {
- font-family: Verdana, sans-serif;
- font-size: 10pt;
- font-weight: 500;
- color: #000066;
-}
-
-/* table desk */
-td {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-input, textarea, select, option {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
-}
-
-a {
- font-family: Verdana, sans-serif;
- color: #3b4f66;
- text-decoration: none;
-}
-
-a:hover{
- font-family: Verdana, sans-serif;
- color: #cc0000;
- text-decoration: none;
-}
-
-pre {
- background:#dddddd
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/management/src/main/webapp/styles.css (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/management/src/main/webapp/styles.css)
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/styles.css (rev 0)
+++ stack/metro/trunk/modules/management/src/main/webapp/styles.css 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,186 @@
+
+/* table for list views */
+.table_list {
+}
+
+/* table for detail views */
+.table_form {
+}
+
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #3b4f66;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
+/* table row header */
+.list_tr_head {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ font-weight: 600;
+ text-align: center;
+ background-color: #3b4f66;
+}
+
+/* table row list view */
+.list_tr {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view odd lines */
+.list_tr_even {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view even lines */
+.list_tr_odd {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+}
+
+/* form label */
+.form_label {
+ font-family: Verdana, sans-serif;
+ font-weight: 500;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+/* form value */
+.form_value {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: baseline;
+}
+
+/* tiny writing */
+.tiny {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #666666;
+}
+
+/* required input fields */
+.inputmust {
+ background-color: #dddddd;
+}
+
+/* error message */
+.error {
+ font-family: Courier New;
+ color: #990000;
+}
+
+/* error message */
+.error_trace {
+ font-family: Courier New;
+}
+
+/* active tree node */
+.tree_active_label {
+ font-weight: bold;
+}
+
+body {
+ font-family: Verdana,, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ background-color: #ffffff;
+}
+
+/* title style */
+h1 {
+ font-family: Verdana, sans-serif;
+ font-size: 14pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h2 {
+ font-family: Verdana, sans-serif;
+ font-size: 12pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h3 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h4 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 500;
+ color: #000066;
+}
+
+/* table desk */
+td {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+input, textarea, select, option {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+}
+
+a {
+ font-family: Verdana, sans-serif;
+ color: #3b4f66;
+ text-decoration: none;
+}
+
+a:hover{
+ font-family: Verdana, sans-serif;
+ color: #cc0000;
+ text-decoration: none;
+}
+
+pre {
+ background:#dddddd
+}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server)
Property changes on: stack/metro/trunk/modules/server
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,229 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Runtime Server</name>
- <artifactId>jbossws-metro-server</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
-
- <!-- jbossws dependencies -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
-
- <!-- Metro dependencies -->
- <dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>http</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-local-transport</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr173_api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr181-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>resolver</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>txnannprocessor</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xmldsig</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xmlsec</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>xws-security</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-lgpl</artifactId>
- </dependency>
-
- <!-- jboss provided -->
- <dependency>
- <groupId>jboss.common</groupId>
- <artifactId>jboss-common</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <!-- transitve dependencies -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <type>sar</type>
- </dependency>
- </dependencies>
-
- <!-- Plugins -->
- <build>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <directory>src/main/resources/jbossws-metro-server.jar</directory>
- </resource>
- <resource>
- <targetPath>../resources/jbossws-metro.sar</targetPath>
- <directory>src/main/resources/jbossws-metro.sar</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <version>${jbossws.jboss500.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <version>${jbossws.jboss501.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/>
- <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/>
- <ant antfile="src/main/scripts/antrun-beans-config.xml"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: stack/metro/trunk/modules/server/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/pom.xml)
===================================================================
--- stack/metro/trunk/modules/server/pom.xml (rev 0)
+++ stack/metro/trunk/modules/server/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,229 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Runtime Server</name>
+ <artifactId>jbossws-metro-server</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- Metro dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-local-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>txnannprocessor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmldsig</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xws-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ </dependency>
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <!-- transitve dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>src/main/resources/jbossws-metro-server.jar</directory>
+ </resource>
+ <resource>
+ <targetPath>../resources/jbossws-metro.sar</targetPath>
+ <directory>src/main/resources/jbossws-metro.sar</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/>
+ <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/>
+ <ant antfile="src/main/scripts/antrun-beans-config.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: stack/metro/trunk/modules/server/src (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src)
Copied: stack/metro/trunk/modules/server/src/main (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main)
Copied: stack/metro/trunk/modules/server/src/main/java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java)
Copied: stack/metro/trunk/modules/server/src/main/java/org (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org)
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss)
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf)
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack)
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro)
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,596 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-// $Id$
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.MTOMFeature;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.xml.sax.EntityResolver;
-
-import com.sun.xml.ws.api.BindingID;
-import com.sun.xml.ws.api.WSBinding;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.SDDocumentSource;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory;
-import com.sun.xml.ws.binding.WebServiceFeatureList;
-import com.sun.xml.ws.handler.HandlerChainsModel;
-import com.sun.xml.ws.resources.ServerMessages;
-import com.sun.xml.ws.resources.WsservletMessages;
-import com.sun.xml.ws.server.EndpointFactory;
-import com.sun.xml.ws.server.ServerRtException;
-import com.sun.xml.ws.streaming.Attributes;
-import com.sun.xml.ws.streaming.TidyXMLStreamReader;
-import com.sun.xml.ws.streaming.XMLStreamReaderUtil;
-import com.sun.xml.ws.transport.http.HttpAdapter;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-import com.sun.xml.ws.util.HandlerAnnotationInfo;
-import com.sun.xml.ws.util.exception.LocatableWebServiceException;
-import com.sun.xml.ws.util.xml.XmlUtil;
-
-/**
- * A copy of DeploymentDescriptorParser
- * @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
- * @author WS Development Team
- * @author Kohsuke Kawaguchi
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DeploymentDescriptorParserExt<A>
-{
- private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
-
- public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime";
- public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl";
- public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints");
- public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint");
- public static final String ATTR_VERSION = "version";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_IMPLEMENTATION = "implementation";
- public static final String ATTR_WSDL = "wsdl";
- public static final String ATTR_SERVICE = "service";
- public static final String ATTR_PORT = "port";
- public static final String ATTR_URL_PATTERN = "url-pattern";
- public static final String ATTR_ENABLE_MTOM = "enable-mtom";
- public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value";
- public static final String ATTR_BINDING = "binding";
- public static final String ATTRVALUE_VERSION_1_0 = "2.0";
-
- private final Container container;
- private final ClassLoader classLoader;
- private final ResourceLoader loader;
- private final AdapterFactory<A> adapterFactory;
-
- private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
-
- /**
- * Endpoint names that are declared.
- * Used to catch double definitions.
- */
- private final Set<String> names = new HashSet<String>();
-
- /**
- * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID.
- */
- private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>();
-
- /**
- *
- * @param cl
- * Used to load service implementations.
- * @param loader
- * Used to locate resources, in particular WSDL.
- * @param container
- * Optional {@link Container} that {@link WSEndpoint}s receive.
- * @param adapterFactory
- * Creates {@link HttpAdapter} (or its derived class.)
- */
- public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
- {
- classLoader = cl;
- this.loader = loader;
- this.container = container;
- this.adapterFactory = adapterFactory;
-
- // toggle EJB and WEB deployments
- String resourcePath = "/META-INF/";
- try
- {
- URL resource = loader.getResource(resourcePath);
- InputStream inputStream = null;
- try
- {
- inputStream = resource.openStream();
- }
- finally
- {
- if(inputStream!=null)
- inputStream.close();
- }
-
- log.warn("bypass collectDocs(), it doesnt work for EJB endpoints");
- }
- catch (Exception e)
- {
- resourcePath = "/WEB-INF/";
- log.debug("Collecting docs from " + resourcePath);
-
- collectDocs(resourcePath+"wsdl/");
- logger.fine("metadata=" + docs);
- }
-
- }
-
- /**
- * Parses the {@code sun-jaxws.xml} file and configures
- * a set of {@link HttpAdapter}s.
- */
- public List<A> parse(String systemId, InputStream is)
- {
- XMLStreamReader reader = null;
- try
- {
- reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is);
- XMLStreamReaderUtil.nextElementContent(reader);
- return parseAdapters(reader);
- }
- finally
- {
- if (reader != null)
- {
- try
- {
- reader.close();
- }
- catch (XMLStreamException e)
- {
- throw new ServerRtException("runtime.parser.xmlReader", e);
- }
- }
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- // ignore
- }
- }
- }
-
- /**
- * Parses the {@code sun-jaxws.xml} file and configures
- * a set of {@link HttpAdapter}s.
- */
- public List<A> parse(File f) throws IOException
- {
- FileInputStream in = new FileInputStream(f);
- try
- {
- return parse(f.getPath(), in);
- }
- finally
- {
- in.close();
- }
- }
-
- /**
- * Get all the WSDL & schema documents recursively.
- */
- private void collectDocs(String dirPath) throws MalformedURLException
- {
- Set<String> paths = loader.getResourcePaths(dirPath);
- if (paths != null)
- {
- for (String path : paths)
- {
- if (path.endsWith("/"))
- {
- collectDocs(path);
- }
- else
- {
- URL res = loader.getResource(path);
- docs.put(res.toString(), SDDocumentSource.create(res));
- }
- }
- }
- }
-
- private List<A> parseAdapters(XMLStreamReader reader)
- {
- if (!reader.getName().equals(QNAME_ENDPOINTS))
- {
- failWithFullName("runtime.parser.invalidElement", reader);
- }
-
- List<A> adapters = new ArrayList<A>();
-
- Attributes attrs = XMLStreamReaderUtil.getAttributes(reader);
- String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION);
- if (!version.equals(ATTRVALUE_VERSION_1_0))
- {
- failWithLocalName("runtime.parser.invalidVersionNumber", reader, version);
- }
-
- while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT)
- if (reader.getName().equals(QNAME_ENDPOINT))
- {
-
- attrs = XMLStreamReaderUtil.getAttributes(reader);
- String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME);
- if (!names.add(name))
- {
- logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/));
- }
-
- String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION);
- Class<?> implementorClass = getImplementorClass(implementationName, reader, this.classLoader);
- EndpointFactory.verifyImplementorClass(implementorClass);
-
- SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass, this.classLoader, this.docs);
-
- QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE);
- if (serviceName == null)
- serviceName = EndpointFactory.getDefaultServiceName(implementorClass);
-
- QName portName = getQNameAttribute(attrs, ATTR_PORT);
- if (portName == null)
- portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass);
-
- //get enable-mtom attribute value
- String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM);
- String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE);
- String bindingId = getAttribute(attrs, ATTR_BINDING);
- if (bindingId != null)
- // Convert short-form tokens to API's binding ids
- bindingId = getBindingIdForToken(bindingId);
- WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold);
- String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN);
-
- // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary.
-
- boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName, this.classLoader);
-
- ensureNoContent(reader);
- Invoker invoker = createInvoker(implementorClass);
- WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
- serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
- adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
- }
- else
- {
- failWithLocalName("runtime.parser.invalidElement", reader);
- }
- return adapters;
- }
-
- protected Invoker createInvoker(Class<?> implementorClass)
- {
- Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker();
- return invoker;
- }
-
- /**
- * @param ddBindingId
- * binding id explicitlyspecified in the DeploymentDescriptor or parameter
- * @param implClass
- * Endpoint Implementation class
- * @param mtomEnabled
- * represents mtom-enabled attribute in DD
- * @param mtomThreshold
- * threshold value specified in DD
- * @return
- * is returned with only MTOMFeature set resolving the various precendece rules
- */
- private static WSBinding createBinding(String ddBindingId, Class<?> implClass, String mtomEnabled, String mtomThreshold)
- {
- // Features specified through DD
- WebServiceFeatureList features;
-
- MTOMFeature mtomfeature = null;
- if (mtomEnabled != null)
- {
- if (mtomThreshold != null)
- mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold));
- else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled));
- }
-
- BindingID bindingID;
- if (ddBindingId != null)
- {
- bindingID = BindingID.parse(ddBindingId);
- features = bindingID.createBuiltinFeatureList();
-
- if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature))
- {
- throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled));
- }
- }
- else
- {
- bindingID = BindingID.parse(implClass);
- // Since bindingID is coming from implclass,
- // mtom through Feature annotation or DD takes precendece
-
- features = new WebServiceFeatureList();
- if (mtomfeature != null)
- features.add(mtomfeature); // this wins over MTOM setting in bindingID
- features.addAll(bindingID.createBuiltinFeatureList());
- }
-
- return bindingID.createBinding(features.toArray());
- }
-
- private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs)
- {
- if (lhs == null || rhs == null)
- return false;
- return lhs.isEnabled() ^ rhs.isEnabled();
- }
-
- /**
- * JSR-109 defines short-form tokens for standard binding Ids. These are
- * used only in DD. So stand alone deployment descirptor should also honor
- * these tokens. This method converts the tokens to API's standard
- * binding ids
- *
- * @param lexical binding attribute value from DD. Always not null
- *
- * @return returns corresponding API's binding ID or the same lexical
- */
- private static String getBindingIdForToken(String lexical)
- {
- if (lexical.equals("##SOAP11_HTTP"))
- {
- return SOAPBinding.SOAP11HTTP_BINDING;
- }
- else if (lexical.equals("##SOAP11_HTTP_MTOM"))
- {
- return SOAPBinding.SOAP11HTTP_MTOM_BINDING;
- }
- else if (lexical.equals("##SOAP12_HTTP"))
- {
- return SOAPBinding.SOAP12HTTP_BINDING;
- }
- else if (lexical.equals("##SOAP12_HTTP_MTOM"))
- {
- return SOAPBinding.SOAP12HTTP_MTOM_BINDING;
- }
- else if (lexical.equals("##XML_HTTP"))
- {
- return HTTPBinding.HTTP_BINDING;
- }
- return lexical;
- }
-
- /**
- * Checks the deployment descriptor or {@link @WebServiceProvider} annotation
- * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}.
- *
- * @return
- * The pointed WSDL, if any. Otherwise null.
- */
- private static SDDocumentSource getPrimaryWSDL
- (
- XMLStreamReader xsr,
- Attributes attrs,
- Class<?> implementorClass,
- ClassLoader loader,
- Map<String, SDDocumentSource> docs
- )
- {
- String wsdlFile = getAttribute(attrs, ATTR_WSDL);
- if (wsdlFile == null)
- {
- wsdlFile = EndpointFactory.getWsdlLocation(implementorClass);
- }
-
- if (wsdlFile != null)
- {
- URL wsdl = loader.getResource(wsdlFile);
- if (wsdl == null)
- {
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr);
- }
-
- // bypass the docs init
- docs.put(wsdl.toExternalForm(), SDDocumentSource.create(wsdl));
-
- SDDocumentSource docInfo = docs.get(wsdl.toExternalForm());
- assert docInfo != null;
- return docInfo;
- }
-
- return null;
- }
-
- /**
- * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}.
- */
- private static EntityResolver createEntityResolver(ResourceLoader loader)
- {
- try
- {
- return XmlUtil.createEntityResolver(loader.getCatalogFile());
- }
- catch (MalformedURLException e)
- {
- throw new WebServiceException(e);
- }
- }
-
- private static String getAttribute(Attributes attrs, String name)
- {
- String value = attrs.getValue(name);
- if (value != null)
- {
- value = value.trim();
- }
- return value;
- }
-
- private static QName getQNameAttribute(Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value == null || value.equals(""))
- {
- return null;
- }
- else
- {
- return QName.valueOf(value);
- }
- }
-
- /*
- private static String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value != null && value.equals(""))
- {
- failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
- }
- return value;
- }
-
- private static String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name)
- {
- String value = getAttribute(attrs, name);
- if (value == null)
- {
- failWithLocalName("runtime.parser.missing.attribute", reader, name);
- }
- return value;
- }*/
-
- private static String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name)
- {
- String value = getAttribute(attributes, name);
- if (value == null)
- {
- failWithLocalName("runtime.parser.missing.attribute", reader, name);
- }
- else if (value.equals(""))
- {
- failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
- }
- return value;
- }
-
- /**
- * Parses the handler and role information and sets it
- * on the {@link WSBinding}.
- * @return true if <handler-chains> element present in DD false otherwise.
- */
- private static boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName, ClassLoader classLoader)
- {
- if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS))
- {
- return false;
- }
-
- HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding);
- binding.setHandlerChain(handlerInfo.getHandlers());
- if (binding instanceof SOAPBinding)
- {
- ((SOAPBinding)binding).setRoles(handlerInfo.getRoles());
- }
-
- // move past </handler-chains>
- XMLStreamReaderUtil.nextContent(reader);
- return true;
- }
-
- private static void ensureNoContent(XMLStreamReader reader)
- {
- if (reader.getEventType() != XMLStreamConstants.END_ELEMENT)
- {
- fail("runtime.parser.unexpectedContent", reader);
- }
- }
-
- private static void fail(String key, XMLStreamReader reader)
- {
- logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber());
- throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber()));
- }
-
- private static void failWithFullName(String key, XMLStreamReader reader)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName());
- }
-
- private static void failWithLocalName(String key, XMLStreamReader reader)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName());
- }
-
- private static void failWithLocalName(String key, XMLStreamReader reader, String arg)
- {
- throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg);
- }
-
- /**
- * Loads the class of the given name.
- * @param reader used to report the source location information if there's any error
- */
- private static Class<?> getImplementorClass(String name, XMLStreamReader reader, ClassLoader classLoader)
- {
- try
- {
- return Class.forName(name, true, classLoader);
- }
- catch (ClassNotFoundException e)
- {
- logger.log(Level.SEVERE, e.getMessage(), e);
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
- }
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,596 @@
+/*
+ * 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.wsf.stack.metro;
+
+// $Id$
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.xml.sax.EntityResolver;
+
+import com.sun.xml.ws.api.BindingID;
+import com.sun.xml.ws.api.WSBinding;
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.InstanceResolver;
+import com.sun.xml.ws.api.server.Invoker;
+import com.sun.xml.ws.api.server.SDDocumentSource;
+import com.sun.xml.ws.api.server.WSEndpoint;
+import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.ws.binding.WebServiceFeatureList;
+import com.sun.xml.ws.handler.HandlerChainsModel;
+import com.sun.xml.ws.resources.ServerMessages;
+import com.sun.xml.ws.resources.WsservletMessages;
+import com.sun.xml.ws.server.EndpointFactory;
+import com.sun.xml.ws.server.ServerRtException;
+import com.sun.xml.ws.streaming.Attributes;
+import com.sun.xml.ws.streaming.TidyXMLStreamReader;
+import com.sun.xml.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.ws.transport.http.HttpAdapter;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
+import com.sun.xml.ws.util.HandlerAnnotationInfo;
+import com.sun.xml.ws.util.exception.LocatableWebServiceException;
+import com.sun.xml.ws.util.xml.XmlUtil;
+
+/**
+ * A copy of DeploymentDescriptorParser
+ * @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
+ * @author WS Development Team
+ * @author Kohsuke Kawaguchi
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DeploymentDescriptorParserExt<A>
+{
+ private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
+
+ public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime";
+ public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl";
+ public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints");
+ public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint");
+ public static final String ATTR_VERSION = "version";
+ public static final String ATTR_NAME = "name";
+ public static final String ATTR_IMPLEMENTATION = "implementation";
+ public static final String ATTR_WSDL = "wsdl";
+ public static final String ATTR_SERVICE = "service";
+ public static final String ATTR_PORT = "port";
+ public static final String ATTR_URL_PATTERN = "url-pattern";
+ public static final String ATTR_ENABLE_MTOM = "enable-mtom";
+ public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value";
+ public static final String ATTR_BINDING = "binding";
+ public static final String ATTRVALUE_VERSION_1_0 = "2.0";
+
+ private final Container container;
+ private final ClassLoader classLoader;
+ private final ResourceLoader loader;
+ private final AdapterFactory<A> adapterFactory;
+
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
+
+ /**
+ * Endpoint names that are declared.
+ * Used to catch double definitions.
+ */
+ private final Set<String> names = new HashSet<String>();
+
+ /**
+ * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID.
+ */
+ private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>();
+
+ /**
+ *
+ * @param cl
+ * Used to load service implementations.
+ * @param loader
+ * Used to locate resources, in particular WSDL.
+ * @param container
+ * Optional {@link Container} that {@link WSEndpoint}s receive.
+ * @param adapterFactory
+ * Creates {@link HttpAdapter} (or its derived class.)
+ */
+ public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
+ {
+ classLoader = cl;
+ this.loader = loader;
+ this.container = container;
+ this.adapterFactory = adapterFactory;
+
+ // toggle EJB and WEB deployments
+ String resourcePath = "/META-INF/";
+ try
+ {
+ URL resource = loader.getResource(resourcePath);
+ InputStream inputStream = null;
+ try
+ {
+ inputStream = resource.openStream();
+ }
+ finally
+ {
+ if(inputStream!=null)
+ inputStream.close();
+ }
+
+ log.warn("bypass collectDocs(), it doesnt work for EJB endpoints");
+ }
+ catch (Exception e)
+ {
+ resourcePath = "/WEB-INF/";
+ log.debug("Collecting docs from " + resourcePath);
+
+ collectDocs(resourcePath+"wsdl/");
+ logger.fine("metadata=" + docs);
+ }
+
+ }
+
+ /**
+ * Parses the {@code sun-jaxws.xml} file and configures
+ * a set of {@link HttpAdapter}s.
+ */
+ public List<A> parse(String systemId, InputStream is)
+ {
+ XMLStreamReader reader = null;
+ try
+ {
+ reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is);
+ XMLStreamReaderUtil.nextElementContent(reader);
+ return parseAdapters(reader);
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (XMLStreamException e)
+ {
+ throw new ServerRtException("runtime.parser.xmlReader", e);
+ }
+ }
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+ }
+ }
+
+ /**
+ * Parses the {@code sun-jaxws.xml} file and configures
+ * a set of {@link HttpAdapter}s.
+ */
+ public List<A> parse(File f) throws IOException
+ {
+ FileInputStream in = new FileInputStream(f);
+ try
+ {
+ return parse(f.getPath(), in);
+ }
+ finally
+ {
+ in.close();
+ }
+ }
+
+ /**
+ * Get all the WSDL & schema documents recursively.
+ */
+ private void collectDocs(String dirPath) throws MalformedURLException
+ {
+ Set<String> paths = loader.getResourcePaths(dirPath);
+ if (paths != null)
+ {
+ for (String path : paths)
+ {
+ if (path.endsWith("/"))
+ {
+ collectDocs(path);
+ }
+ else
+ {
+ URL res = loader.getResource(path);
+ docs.put(res.toString(), SDDocumentSource.create(res));
+ }
+ }
+ }
+ }
+
+ private List<A> parseAdapters(XMLStreamReader reader)
+ {
+ if (!reader.getName().equals(QNAME_ENDPOINTS))
+ {
+ failWithFullName("runtime.parser.invalidElement", reader);
+ }
+
+ List<A> adapters = new ArrayList<A>();
+
+ Attributes attrs = XMLStreamReaderUtil.getAttributes(reader);
+ String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION);
+ if (!version.equals(ATTRVALUE_VERSION_1_0))
+ {
+ failWithLocalName("runtime.parser.invalidVersionNumber", reader, version);
+ }
+
+ while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT)
+ if (reader.getName().equals(QNAME_ENDPOINT))
+ {
+
+ attrs = XMLStreamReaderUtil.getAttributes(reader);
+ String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME);
+ if (!names.add(name))
+ {
+ logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/));
+ }
+
+ String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION);
+ Class<?> implementorClass = getImplementorClass(implementationName, reader, this.classLoader);
+ EndpointFactory.verifyImplementorClass(implementorClass);
+
+ SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass, this.classLoader, this.docs);
+
+ QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE);
+ if (serviceName == null)
+ serviceName = EndpointFactory.getDefaultServiceName(implementorClass);
+
+ QName portName = getQNameAttribute(attrs, ATTR_PORT);
+ if (portName == null)
+ portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass);
+
+ //get enable-mtom attribute value
+ String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM);
+ String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE);
+ String bindingId = getAttribute(attrs, ATTR_BINDING);
+ if (bindingId != null)
+ // Convert short-form tokens to API's binding ids
+ bindingId = getBindingIdForToken(bindingId);
+ WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold);
+ String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN);
+
+ // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary.
+
+ boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName, this.classLoader);
+
+ ensureNoContent(reader);
+ Invoker invoker = createInvoker(implementorClass);
+ WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
+ serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
+ adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
+ }
+ else
+ {
+ failWithLocalName("runtime.parser.invalidElement", reader);
+ }
+ return adapters;
+ }
+
+ protected Invoker createInvoker(Class<?> implementorClass)
+ {
+ Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker();
+ return invoker;
+ }
+
+ /**
+ * @param ddBindingId
+ * binding id explicitlyspecified in the DeploymentDescriptor or parameter
+ * @param implClass
+ * Endpoint Implementation class
+ * @param mtomEnabled
+ * represents mtom-enabled attribute in DD
+ * @param mtomThreshold
+ * threshold value specified in DD
+ * @return
+ * is returned with only MTOMFeature set resolving the various precendece rules
+ */
+ private static WSBinding createBinding(String ddBindingId, Class<?> implClass, String mtomEnabled, String mtomThreshold)
+ {
+ // Features specified through DD
+ WebServiceFeatureList features;
+
+ MTOMFeature mtomfeature = null;
+ if (mtomEnabled != null)
+ {
+ if (mtomThreshold != null)
+ mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold));
+ else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled));
+ }
+
+ BindingID bindingID;
+ if (ddBindingId != null)
+ {
+ bindingID = BindingID.parse(ddBindingId);
+ features = bindingID.createBuiltinFeatureList();
+
+ if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature))
+ {
+ throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled));
+ }
+ }
+ else
+ {
+ bindingID = BindingID.parse(implClass);
+ // Since bindingID is coming from implclass,
+ // mtom through Feature annotation or DD takes precendece
+
+ features = new WebServiceFeatureList();
+ if (mtomfeature != null)
+ features.add(mtomfeature); // this wins over MTOM setting in bindingID
+ features.addAll(bindingID.createBuiltinFeatureList());
+ }
+
+ return bindingID.createBinding(features.toArray());
+ }
+
+ private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs)
+ {
+ if (lhs == null || rhs == null)
+ return false;
+ return lhs.isEnabled() ^ rhs.isEnabled();
+ }
+
+ /**
+ * JSR-109 defines short-form tokens for standard binding Ids. These are
+ * used only in DD. So stand alone deployment descirptor should also honor
+ * these tokens. This method converts the tokens to API's standard
+ * binding ids
+ *
+ * @param lexical binding attribute value from DD. Always not null
+ *
+ * @return returns corresponding API's binding ID or the same lexical
+ */
+ private static String getBindingIdForToken(String lexical)
+ {
+ if (lexical.equals("##SOAP11_HTTP"))
+ {
+ return SOAPBinding.SOAP11HTTP_BINDING;
+ }
+ else if (lexical.equals("##SOAP11_HTTP_MTOM"))
+ {
+ return SOAPBinding.SOAP11HTTP_MTOM_BINDING;
+ }
+ else if (lexical.equals("##SOAP12_HTTP"))
+ {
+ return SOAPBinding.SOAP12HTTP_BINDING;
+ }
+ else if (lexical.equals("##SOAP12_HTTP_MTOM"))
+ {
+ return SOAPBinding.SOAP12HTTP_MTOM_BINDING;
+ }
+ else if (lexical.equals("##XML_HTTP"))
+ {
+ return HTTPBinding.HTTP_BINDING;
+ }
+ return lexical;
+ }
+
+ /**
+ * Checks the deployment descriptor or {@link @WebServiceProvider} annotation
+ * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}.
+ *
+ * @return
+ * The pointed WSDL, if any. Otherwise null.
+ */
+ private static SDDocumentSource getPrimaryWSDL
+ (
+ XMLStreamReader xsr,
+ Attributes attrs,
+ Class<?> implementorClass,
+ ClassLoader loader,
+ Map<String, SDDocumentSource> docs
+ )
+ {
+ String wsdlFile = getAttribute(attrs, ATTR_WSDL);
+ if (wsdlFile == null)
+ {
+ wsdlFile = EndpointFactory.getWsdlLocation(implementorClass);
+ }
+
+ if (wsdlFile != null)
+ {
+ URL wsdl = loader.getResource(wsdlFile);
+ if (wsdl == null)
+ {
+ throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr);
+ }
+
+ // bypass the docs init
+ docs.put(wsdl.toExternalForm(), SDDocumentSource.create(wsdl));
+
+ SDDocumentSource docInfo = docs.get(wsdl.toExternalForm());
+ assert docInfo != null;
+ return docInfo;
+ }
+
+ return null;
+ }
+
+ /**
+ * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}.
+ */
+ private static EntityResolver createEntityResolver(ResourceLoader loader)
+ {
+ try
+ {
+ return XmlUtil.createEntityResolver(loader.getCatalogFile());
+ }
+ catch (MalformedURLException e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
+ private static String getAttribute(Attributes attrs, String name)
+ {
+ String value = attrs.getValue(name);
+ if (value != null)
+ {
+ value = value.trim();
+ }
+ return value;
+ }
+
+ private static QName getQNameAttribute(Attributes attrs, String name)
+ {
+ String value = getAttribute(attrs, name);
+ if (value == null || value.equals(""))
+ {
+ return null;
+ }
+ else
+ {
+ return QName.valueOf(value);
+ }
+ }
+
+ /*
+ private static String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name)
+ {
+ String value = getAttribute(attrs, name);
+ if (value != null && value.equals(""))
+ {
+ failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
+ }
+ return value;
+ }
+
+ private static String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name)
+ {
+ String value = getAttribute(attrs, name);
+ if (value == null)
+ {
+ failWithLocalName("runtime.parser.missing.attribute", reader, name);
+ }
+ return value;
+ }*/
+
+ private static String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name)
+ {
+ String value = getAttribute(attributes, name);
+ if (value == null)
+ {
+ failWithLocalName("runtime.parser.missing.attribute", reader, name);
+ }
+ else if (value.equals(""))
+ {
+ failWithLocalName("runtime.parser.invalidAttributeValue", reader, name);
+ }
+ return value;
+ }
+
+ /**
+ * Parses the handler and role information and sets it
+ * on the {@link WSBinding}.
+ * @return true if <handler-chains> element present in DD false otherwise.
+ */
+ private static boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName, ClassLoader classLoader)
+ {
+ if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS))
+ {
+ return false;
+ }
+
+ HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding);
+ binding.setHandlerChain(handlerInfo.getHandlers());
+ if (binding instanceof SOAPBinding)
+ {
+ ((SOAPBinding)binding).setRoles(handlerInfo.getRoles());
+ }
+
+ // move past </handler-chains>
+ XMLStreamReaderUtil.nextContent(reader);
+ return true;
+ }
+
+ private static void ensureNoContent(XMLStreamReader reader)
+ {
+ if (reader.getEventType() != XMLStreamConstants.END_ELEMENT)
+ {
+ fail("runtime.parser.unexpectedContent", reader);
+ }
+ }
+
+ private static void fail(String key, XMLStreamReader reader)
+ {
+ logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber());
+ throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber()));
+ }
+
+ private static void failWithFullName(String key, XMLStreamReader reader)
+ {
+ throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName());
+ }
+
+ private static void failWithLocalName(String key, XMLStreamReader reader)
+ {
+ throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName());
+ }
+
+ private static void failWithLocalName(String key, XMLStreamReader reader, String arg)
+ {
+ throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg);
+ }
+
+ /**
+ * Loads the class of the given name.
+ * @param reader used to report the source location information if there's any error
+ */
+ private static Class<?> getImplementorClass(String name, XMLStreamReader reader, ClassLoader classLoader)
+ {
+ try
+ {
+ return Class.forName(name, true, classLoader);
+ }
+ catch (ClassNotFoundException e)
+ {
+ logger.log(Level.SEVERE, e.getMessage(), e);
+ throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,67 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-// $Id$
-
-import java.net.MalformedURLException;
-
-import javax.ejb.Stateless;
-
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-
-/**
- * A copy of DeploymentDescriptorParser that externalizes
- *
- * createInvoker(Class)
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A>
-{
- public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
- {
- super(cl, loader, container, adapterFactory);
- }
-
- @Override
- protected Invoker createInvoker(Class<?> implClass)
- {
- Invoker invoker;
- InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass);
- if (implClass.isAnnotationPresent(Stateless.class))
- {
- invoker = new InvokerEJB3(resolver);
- }
- else
- {
- invoker = new InvokerJSE(resolver);
- }
- return invoker;
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,67 @@
+/*
+ * 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.wsf.stack.metro;
+
+// $Id$
+
+import java.net.MalformedURLException;
+
+import javax.ejb.Stateless;
+
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.InstanceResolver;
+import com.sun.xml.ws.api.server.Invoker;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
+
+/**
+ * A copy of DeploymentDescriptorParser that externalizes
+ *
+ * createInvoker(Class)
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A>
+{
+ public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException
+ {
+ super(cl, loader, container, adapterFactory);
+ }
+
+ @Override
+ protected Invoker createInvoker(Class<?> implClass)
+ {
+ Invoker invoker;
+ InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass);
+ if (implClass.isAnnotationPresent(Stateless.class))
+ {
+ invoker = new InvokerEJB3(resolver);
+ }
+ else
+ {
+ invoker = new InvokerJSE(resolver);
+ }
+ return invoker;
+ }
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,45 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.common.KernelAwareSPIFactory;
-
-/**
- * An EndpointRegistryFactory implementation that retrieves
- * the registry from MC kernel.
- *
- * @see EndpointRegistry.BEAN_NAME
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 23, 2007
- */
-public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
-{
- public EndpointRegistry getEndpointRegistry()
- {
- return new KernelAwareSPIFactory().getKernelProvidedSPI(
- EndpointRegistry.BEAN_NAME, EndpointRegistry.class
- );
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,45 @@
+/*
+ * 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.wsf.stack.metro;
+
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
+
+/**
+ * An EndpointRegistryFactory implementation that retrieves
+ * the registry from MC kernel.
+ *
+ * @see EndpointRegistry.BEAN_NAME
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 23, 2007
+ */
+public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
+{
+ public EndpointRegistry getEndpointRegistry()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ EndpointRegistry.BEAN_NAME, EndpointRegistry.class
+ );
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,103 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.common.ObjectNameFactory;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.management.ObjectName;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class EndpointServlet extends HttpServlet
-{
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- public void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
- try
- {
- EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /** Initialize the service endpoint
- */
- protected void initServiceEndpoint(String contextPath)
- {
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
- this.endpoint = epRegistry.resolve(resolver);
-
- if (this.endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
- );
- throw new WebServiceException("Cannot obtain endpoint for: " + oname);
- }
-
- // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- dep.setRuntimeClassLoader(classLoader);
- }
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,103 @@
+/*
+ * 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.wsf.stack.metro;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServlet;
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,116 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-// $Id$
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WSWebServiceContext;
-
-/**
- * An invoker for EJB3 endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class InvokerEJB3 extends Invoker
-{
- private final InstanceResolver resolver;
- private WSWebServiceContext webServiceCtx;
-
- public InvokerEJB3(InstanceResolver resolver)
- {
- this.resolver = resolver;
- }
-
- @Override
- public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
- {
- this.resolver.start(webServiceCtx, endpoint);
- this.webServiceCtx = webServiceCtx;
- }
-
- @Override
- public void dispose()
- {
- this.resolver.dispose();
- }
-
- @Override
- public <T> T invokeProvider(Packet p, T arg)
- {
- Object targetBean = this.resolver.resolve(p);
- return ((Provider<T>)targetBean).invoke(arg);
- }
-
- @Override
- public Object invoke(Packet p, Method m, Object... args)
- throws InvocationTargetException, IllegalAccessException
- {
- Endpoint endpoint = EndpointAssociation.getEndpoint();
- InvocationHandler invocationHandler = endpoint.getInvocationHandler();
- Invocation invocation = invocationHandler.createInvocation();
- invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
- invocation.setJavaMethod(m);
- invocation.setArgs(args);
-
- Object retObj = null;
- try
- {
- invocationHandler.invoke(endpoint, invocation);
- retObj = invocation.getReturnValue();
- }
- catch (Exception ex)
- {
- handleException(ex);
- }
-
- return retObj;
- }
-
- private void handleException(Exception ex)
- throws InvocationTargetException, IllegalAccessException
- {
- if (ex instanceof InvocationTargetException)
- throw (InvocationTargetException)ex;
-
- if (ex instanceof IllegalAccessException)
- throw (IllegalAccessException)ex;
-
- throw new WebServiceException(ex);
- }
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,116 @@
+/*
+ * 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.wsf.stack.metro;
+
+// $Id$
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.server.InstanceResolver;
+import com.sun.xml.ws.api.server.Invoker;
+import com.sun.xml.ws.api.server.WSEndpoint;
+import com.sun.xml.ws.api.server.WSWebServiceContext;
+
+/**
+ * An invoker for EJB3 endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class InvokerEJB3 extends Invoker
+{
+ private final InstanceResolver resolver;
+ private WSWebServiceContext webServiceCtx;
+
+ public InvokerEJB3(InstanceResolver resolver)
+ {
+ this.resolver = resolver;
+ }
+
+ @Override
+ public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
+ {
+ this.resolver.start(webServiceCtx, endpoint);
+ this.webServiceCtx = webServiceCtx;
+ }
+
+ @Override
+ public void dispose()
+ {
+ this.resolver.dispose();
+ }
+
+ @Override
+ public <T> T invokeProvider(Packet p, T arg)
+ {
+ Object targetBean = this.resolver.resolve(p);
+ return ((Provider<T>)targetBean).invoke(arg);
+ }
+
+ @Override
+ public Object invoke(Packet p, Method m, Object... args)
+ throws InvocationTargetException, IllegalAccessException
+ {
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ InvocationHandler invocationHandler = endpoint.getInvocationHandler();
+ Invocation invocation = invocationHandler.createInvocation();
+ invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
+ invocation.setJavaMethod(m);
+ invocation.setArgs(args);
+
+ Object retObj = null;
+ try
+ {
+ invocationHandler.invoke(endpoint, invocation);
+ retObj = invocation.getReturnValue();
+ }
+ catch (Exception ex)
+ {
+ handleException(ex);
+ }
+
+ return retObj;
+ }
+
+ private void handleException(Exception ex)
+ throws InvocationTargetException, IllegalAccessException
+ {
+ if (ex instanceof InvocationTargetException)
+ throw (InvocationTargetException)ex;
+
+ if (ex instanceof IllegalAccessException)
+ throw (IllegalAccessException)ex;
+
+ throw new WebServiceException(ex);
+ }
+}
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,116 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-// $Id$
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceException;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.InstanceResolver;
-import com.sun.xml.ws.api.server.Invoker;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WSWebServiceContext;
-
-/**
- * An invoker for JSE endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class InvokerJSE extends Invoker
-{
- private final InstanceResolver resolver;
-
- public InvokerJSE(InstanceResolver resolver)
- {
- this.resolver = resolver;
- }
-
- @Override
- public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
- {
- resolver.start(webServiceCtx, endpoint);
- }
-
- @Override
- public void dispose()
- {
- resolver.dispose();
- }
-
- @Override
- public <T> T invokeProvider(Packet p, T arg)
- {
- Object targetBean = resolver.resolve(p);
- return ((Provider<T>)targetBean).invoke(arg);
- }
-
- @Override
- public Object invoke(Packet p, Method m, Object... args)
- throws InvocationTargetException, IllegalAccessException
- {
- Endpoint endpoint = EndpointAssociation.getEndpoint();
- InvocationHandler invocationHandler = endpoint.getInvocationHandler();
- Invocation invocation = invocationHandler.createInvocation();
- InvocationContext invContext = invocation.getInvocationContext();
- invocation.setJavaMethod(m);
- invocation.setArgs(args);
-
- Object retObj = null;
- try
- {
- Object targetBean = resolver.resolve(p);
- invContext.setTargetBean(targetBean);
- invocationHandler.invoke(endpoint, invocation);
- retObj = invocation.getReturnValue();
- }
- catch (Exception ex)
- {
- handleException(ex);
- }
-
- return retObj;
- }
-
- private void handleException(Exception ex)
- throws InvocationTargetException, IllegalAccessException
- {
- if (ex instanceof InvocationTargetException)
- throw (InvocationTargetException)ex;
-
- if (ex instanceof IllegalAccessException)
- throw (IllegalAccessException)ex;
-
- throw new WebServiceException(ex);
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,116 @@
+/*
+ * 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.wsf.stack.metro;
+
+// $Id$
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.server.InstanceResolver;
+import com.sun.xml.ws.api.server.Invoker;
+import com.sun.xml.ws.api.server.WSEndpoint;
+import com.sun.xml.ws.api.server.WSWebServiceContext;
+
+/**
+ * An invoker for JSE endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class InvokerJSE extends Invoker
+{
+ private final InstanceResolver resolver;
+
+ public InvokerJSE(InstanceResolver resolver)
+ {
+ this.resolver = resolver;
+ }
+
+ @Override
+ public void start(WSWebServiceContext webServiceCtx, WSEndpoint endpoint)
+ {
+ resolver.start(webServiceCtx, endpoint);
+ }
+
+ @Override
+ public void dispose()
+ {
+ resolver.dispose();
+ }
+
+ @Override
+ public <T> T invokeProvider(Packet p, T arg)
+ {
+ Object targetBean = resolver.resolve(p);
+ return ((Provider<T>)targetBean).invoke(arg);
+ }
+
+ @Override
+ public Object invoke(Packet p, Method m, Object... args)
+ throws InvocationTargetException, IllegalAccessException
+ {
+ Endpoint endpoint = EndpointAssociation.getEndpoint();
+ InvocationHandler invocationHandler = endpoint.getInvocationHandler();
+ Invocation invocation = invocationHandler.createInvocation();
+ InvocationContext invContext = invocation.getInvocationContext();
+ invocation.setJavaMethod(m);
+ invocation.setArgs(args);
+
+ Object retObj = null;
+ try
+ {
+ Object targetBean = resolver.resolve(p);
+ invContext.setTargetBean(targetBean);
+ invocationHandler.invoke(endpoint, invocation);
+ retObj = invocation.getReturnValue();
+ }
+ catch (Exception ex)
+ {
+ handleException(ex);
+ }
+
+ return retObj;
+ }
+
+ private void handleException(Exception ex)
+ throws InvocationTargetException, IllegalAccessException
+ {
+ if (ex instanceof InvocationTargetException)
+ throw (InvocationTargetException)ex;
+
+ if (ex instanceof IllegalAccessException)
+ throw (IllegalAccessException)ex;
+
+ throw new WebServiceException(ex);
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.Adapter;
-import com.sun.xml.ws.api.server.TransportBackChannel;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Heiko Braun
- */
-public class MessageStreamAdapter extends Adapter<MessageStreamAdapter.StreamToolkit>
-{
- public static final AdapterFactory<MessageStreamAdapter> FACTORY = new AdapterFactory<MessageStreamAdapter>()
- {
- public MessageStreamAdapter createAdapter(String name, String urlPattern, WSEndpoint<?> endpoint)
- {
- return new MessageStreamAdapter(endpoint);
- }
- };
-
- public MessageStreamAdapter(WSEndpoint endpoint)
- {
- super(endpoint);
- }
-
- public void handle(MessageStreamContext context, InputStream in, OutputStream out)
- throws IOException
- {
- MessageStreamConnectionImpl connection = new MessageStreamConnectionImpl(context, in, out);
-
- StreamToolkit tk = pool.take();
- try
- {
- tk.handle(connection);
- connection.flush();
- }
- finally
- {
- pool.recycle(tk);
- connection.close();
- }
- }
-
- protected StreamToolkit createToolkit()
- {
- return new StreamToolkit();
- }
-
- class StreamToolkit extends Adapter.Toolkit implements TransportBackChannel
- {
- private MessageStreamConnectionImpl connection;
-
- private void handle(MessageStreamConnectionImpl connection)
- throws IOException
- {
- this.connection = connection;
-
- String contentTypeStr = connection.getRequestHeader(MessageStreamContext.CONTENT_TYPE);
- InputStream in = connection.getInputStream();
- Packet packet = new Packet();
- codec.decode(in, contentTypeStr, packet);
-
- try
- {
- packet = head.process(packet, connection, this);
- }
- catch(Exception e)
- {
- e.printStackTrace();
- connection.setStatus(MessageStreamContext.STATUS_INTERNAL_SERVER_ERROR);
- return;
- }
-
- contentTypeStr = codec.getStaticContentType(packet).getContentType();
- if (contentTypeStr == null)
- {
- throw new UnsupportedOperationException();
- }
- else
- {
- Map<String, String> headers = new HashMap();
- headers.put(MessageStreamContext.CONTENT_TYPE, contentTypeStr);
- connection.setResponseHeaders(headers);
- codec.encode(packet, connection.getOutputStream());
- }
- }
-
- public void close()
- {
- connection.close();
- }
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamAdapter.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.server.Adapter;
+import com.sun.xml.ws.api.server.TransportBackChannel;
+import com.sun.xml.ws.api.server.WSEndpoint;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Heiko Braun
+ */
+public class MessageStreamAdapter extends Adapter<MessageStreamAdapter.StreamToolkit>
+{
+ public static final AdapterFactory<MessageStreamAdapter> FACTORY = new AdapterFactory<MessageStreamAdapter>()
+ {
+ public MessageStreamAdapter createAdapter(String name, String urlPattern, WSEndpoint<?> endpoint)
+ {
+ return new MessageStreamAdapter(endpoint);
+ }
+ };
+
+ public MessageStreamAdapter(WSEndpoint endpoint)
+ {
+ super(endpoint);
+ }
+
+ public void handle(MessageStreamContext context, InputStream in, OutputStream out)
+ throws IOException
+ {
+ MessageStreamConnectionImpl connection = new MessageStreamConnectionImpl(context, in, out);
+
+ StreamToolkit tk = pool.take();
+ try
+ {
+ tk.handle(connection);
+ connection.flush();
+ }
+ finally
+ {
+ pool.recycle(tk);
+ connection.close();
+ }
+ }
+
+ protected StreamToolkit createToolkit()
+ {
+ return new StreamToolkit();
+ }
+
+ class StreamToolkit extends Adapter.Toolkit implements TransportBackChannel
+ {
+ private MessageStreamConnectionImpl connection;
+
+ private void handle(MessageStreamConnectionImpl connection)
+ throws IOException
+ {
+ this.connection = connection;
+
+ String contentTypeStr = connection.getRequestHeader(MessageStreamContext.CONTENT_TYPE);
+ InputStream in = connection.getInputStream();
+ Packet packet = new Packet();
+ codec.decode(in, contentTypeStr, packet);
+
+ try
+ {
+ packet = head.process(packet, connection, this);
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ connection.setStatus(MessageStreamContext.STATUS_INTERNAL_SERVER_ERROR);
+ return;
+ }
+
+ contentTypeStr = codec.getStaticContentType(packet).getContentType();
+ if (contentTypeStr == null)
+ {
+ throw new UnsupportedOperationException();
+ }
+ else
+ {
+ Map<String, String> headers = new HashMap();
+ headers.put(MessageStreamContext.CONTENT_TYPE, contentTypeStr);
+ connection.setResponseHeaders(headers);
+ codec.encode(packet, connection.getOutputStream());
+ }
+ }
+
+ public void close()
+ {
+ connection.close();
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,181 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.server.WebServiceContextDelegate;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Heiko Braun
- */
-public class MessageStreamConnectionImpl implements WebServiceContextDelegate
-{
- private int status;
- private boolean isClosed;
- private InputStream inputStream;
- private OutputStream outputStream;
- private MessageStreamContext messageContext;
- private Map<String, String> requestHeaders = new HashMap<String, String>();
- private Map<String, String> responseHeaders;
-
- public MessageStreamConnectionImpl(MessageStreamContext context, InputStream in, OutputStream out)
- {
- this.outputStream = out;
- this.inputStream = in;
- this.messageContext = context;
- populateRequestHeaders();
- }
-
- public int getStatus()
- {
- return this.status;
- }
-
- public void setStatus(int statusCode)
- {
- this.status = statusCode;
- }
-
- public Map<String, String> getRequestHeaders()
- {
- return this.requestHeaders;
- }
-
- public void setRequestHeaders(Map<String, String> requestHeaders)
- {
- this.requestHeaders = requestHeaders;
- }
-
- public String getRequestHeader(String name)
- {
- return this.requestHeaders.get(name);
- }
-
- public Map<String, String> getResponseHeaders()
- {
- return this.responseHeaders;
- }
-
- public void setResponseHeaders(Map<String, String> responseHeaders)
- {
- this.responseHeaders = responseHeaders;
- }
-
- public InputStream getInputStream()
- {
- return this.inputStream;
- }
-
- public OutputStream getOutputStream()
- {
- return this.outputStream;
- }
-
- public void closeInput()
- {
- if (this.inputStream != null)
- {
- try
- {
- this.inputStream.close();
- }
- catch (IOException ignore) {}
- this.inputStream = null;
- }
- }
-
- public void closeOutput()
- {
- if (this.outputStream != null)
- {
- try
- {
- this.outputStream.close();
- }
- catch (IOException ignore) {}
- this.outputStream = null;
- }
- }
-
- public void close()
- {
- if (this.isClosed == false)
- {
- synchronized (this)
- {
- if (this.isClosed == false)
- {
- this.isClosed = true;
- closeInput();
- closeOutput();
- }
- }
- }
- }
-
- public void flush()
- throws IOException
- {
- if (this.outputStream != null)
- {
- this.outputStream.flush();
- }
- }
-
- public Principal getUserPrincipal(Packet request)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isUserInRole(Packet request, String role)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public String getEPRAddress(Packet request, WSEndpoint endpoint)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public String getWSDLAddress(Packet request, WSEndpoint endpoint)
- {
- throw new UnsupportedOperationException();
- }
-
- private void populateRequestHeaders()
- {
- for(String s : this.messageContext.getRequestContext().keySet())
- {
- this.requestHeaders.put(s, this.messageContext.getRequestContext().get(s));
- }
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamConnectionImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,181 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.server.WSEndpoint;
+import com.sun.xml.ws.api.server.WebServiceContextDelegate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Heiko Braun
+ */
+public class MessageStreamConnectionImpl implements WebServiceContextDelegate
+{
+ private int status;
+ private boolean isClosed;
+ private InputStream inputStream;
+ private OutputStream outputStream;
+ private MessageStreamContext messageContext;
+ private Map<String, String> requestHeaders = new HashMap<String, String>();
+ private Map<String, String> responseHeaders;
+
+ public MessageStreamConnectionImpl(MessageStreamContext context, InputStream in, OutputStream out)
+ {
+ this.outputStream = out;
+ this.inputStream = in;
+ this.messageContext = context;
+ populateRequestHeaders();
+ }
+
+ public int getStatus()
+ {
+ return this.status;
+ }
+
+ public void setStatus(int statusCode)
+ {
+ this.status = statusCode;
+ }
+
+ public Map<String, String> getRequestHeaders()
+ {
+ return this.requestHeaders;
+ }
+
+ public void setRequestHeaders(Map<String, String> requestHeaders)
+ {
+ this.requestHeaders = requestHeaders;
+ }
+
+ public String getRequestHeader(String name)
+ {
+ return this.requestHeaders.get(name);
+ }
+
+ public Map<String, String> getResponseHeaders()
+ {
+ return this.responseHeaders;
+ }
+
+ public void setResponseHeaders(Map<String, String> responseHeaders)
+ {
+ this.responseHeaders = responseHeaders;
+ }
+
+ public InputStream getInputStream()
+ {
+ return this.inputStream;
+ }
+
+ public OutputStream getOutputStream()
+ {
+ return this.outputStream;
+ }
+
+ public void closeInput()
+ {
+ if (this.inputStream != null)
+ {
+ try
+ {
+ this.inputStream.close();
+ }
+ catch (IOException ignore) {}
+ this.inputStream = null;
+ }
+ }
+
+ public void closeOutput()
+ {
+ if (this.outputStream != null)
+ {
+ try
+ {
+ this.outputStream.close();
+ }
+ catch (IOException ignore) {}
+ this.outputStream = null;
+ }
+ }
+
+ public void close()
+ {
+ if (this.isClosed == false)
+ {
+ synchronized (this)
+ {
+ if (this.isClosed == false)
+ {
+ this.isClosed = true;
+ closeInput();
+ closeOutput();
+ }
+ }
+ }
+ }
+
+ public void flush()
+ throws IOException
+ {
+ if (this.outputStream != null)
+ {
+ this.outputStream.flush();
+ }
+ }
+
+ public Principal getUserPrincipal(Packet request)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isUserInRole(Packet request, String role)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public String getEPRAddress(Packet request, WSEndpoint endpoint)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public String getWSDLAddress(Packet request, WSEndpoint endpoint)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ private void populateRequestHeaders()
+ {
+ for(String s : this.messageContext.getRequestContext().keySet())
+ {
+ this.requestHeaders.put(s, this.messageContext.getRequestContext().get(s));
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author Heiko Braun
- */
-class MessageStreamContext
-{
- public static final int STATUS_INTERNAL_SERVER_ERROR = 500;
- public static final String CONTENT_TYPE = "Content-Type";
-
- private Map<String, String> requestContext = new HashMap<String, String>();
- private Map<String, String> responseContext = new HashMap<String, String>();
-
- public Map<String, String> getRequestContext()
- {
- return requestContext;
- }
-
- public void setRequestContext(Map<String, String> requestContext)
- {
- this.requestContext = requestContext;
- }
-
- public Map<String, String> getResponseContext()
- {
- return responseContext;
- }
-
- public void setResponseContext(Map<String, String> responseContext)
- {
- this.responseContext = responseContext;
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MessageStreamContext.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.metro;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Heiko Braun
+ */
+class MessageStreamContext
+{
+ public static final int STATUS_INTERNAL_SERVER_ERROR = 500;
+ public static final String CONTENT_TYPE = "Content-Type";
+
+ private Map<String, String> requestContext = new HashMap<String, String>();
+ private Map<String, String> responseContext = new HashMap<String, String>();
+
+ public Map<String, String> getRequestContext()
+ {
+ return requestContext;
+ }
+
+ public void setRequestContext(Map<String, String> requestContext)
+ {
+ this.requestContext = requestContext;
+ }
+
+ public Map<String, String> getResponseContext()
+ {
+ return responseContext;
+ }
+
+ public void setResponseContext(Map<String, String> responseContext)
+ {
+ this.responseContext = responseContext;
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,55 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.management.AbstractServerConfig;
-
-/**
- * Basic implementation of a ServerConfig
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean
-{
- private static final Logger log = Logger.getLogger(MetroServerConfig.class);
-
- public String getImplementationTitle()
- {
- return getClass().getPackage().getImplementationTitle();
- }
-
- public String getImplementationVersion()
- {
- return getClass().getPackage().getImplementationVersion();
- }
-
- public void create() throws Exception
- {
- log.info(getImplementationTitle());
- log.info(getImplementationVersion());
- super.create();
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,55 @@
+/*
+ * 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.wsf.stack.metro;
+
+//$Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.management.AbstractServerConfig;
+
+/**
+ * Basic implementation of a ServerConfig
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean
+{
+ private static final Logger log = Logger.getLogger(MetroServerConfig.class);
+
+ public String getImplementationTitle()
+ {
+ return getClass().getPackage().getImplementationTitle();
+ }
+
+ public String getImplementationVersion()
+ {
+ return getClass().getPackage().getImplementationVersion();
+ }
+
+ public void create() throws Exception
+ {
+ log.info(getImplementationTitle());
+ log.info(getImplementationVersion());
+ super.create();
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.wsf.common.management.AbstractServerConfigMBean;
-
-/**
- * Basic implementation of a ServerConfig
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public interface MetroServerConfigMBean extends AbstractServerConfigMBean
-{
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+/*
+ * 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.wsf.stack.metro;
+
+//$Id$
+
+import org.jboss.wsf.common.management.AbstractServerConfigMBean;
+
+/**
+ * Basic implementation of a ServerConfig
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public interface MetroServerConfigMBean extends AbstractServerConfigMBean
+{
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,37 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class RequestHandlerFactoryImpl extends RequestHandlerFactory
-{
- public RequestHandler newRequestHandler()
- {
- return new RequestHandlerImpl();
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,37 @@
+/*
+ * 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.wsf.stack.metro;
+
+import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class RequestHandlerFactoryImpl extends RequestHandlerFactory
+{
+ public RequestHandler newRequestHandler()
+ {
+ return new RequestHandlerImpl();
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,288 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-//$Id$
-
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.common.IOUtils;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Map;
-import java.util.Properties;
-import java.net.URL;
-
-/**
- * Request handler that delegates to Metro's ServletAdapter.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-class RequestHandlerImpl implements RequestHandler
-{
- // provide logging
- private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
-
- RequestHandlerImpl()
- {
- }
-
- /**
- * Handles HTTP requests. It supports <b>POST</b> and <b>GET</b> HTTP methods only.
- * @param endpoint endpoint
- * @param req servlet request to handle
- * @param res servlet response to return
- * @param servletCtx servlet context
- * @throws ServletException when some problem occurs
- * @throws IOException when some IO problem occurs
- */
- public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext servletCtx)
- throws ServletException, IOException
- {
- ServletAdapter target = endpoint.getAttachment(ServletAdapter.class);
- if(null == target)
- throw new IllegalStateException("Cannot obtain ServletAdapter");
-
- EndpointAssociation.setEndpoint(endpoint);
- try
- {
- String method = req.getMethod();
- if (method.equals("POST"))
- {
- doPost(target, servletCtx, req, res);
- }
- else if(method.equals("GET"))
- {
- doGet(target, req, servletCtx, res);
- }
- else
- {
- throw new WebServiceException("Unsupported method: " + method);
- }
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /**
- * The InvocationContext accepts a {@link Properties} attachment that can carry request properties.<br/>
- * The properties keys are derived from {@link org.jboss.wsf.stack.metro.MessageStreamContext}
- * @param endpoint endpoint
- * @param inStream input stream
- * @param outStream output stream
- * @param invCtx invocation context
- */
- public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invCtx)
- {
- MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class);
- if (adapter == null)
- throw new IllegalStateException("Cannot obtain: " + adapter.getClass().getName());
-
- try
- {
- // Hacky, but the InvokerJSE requires it.
- // It's better to do it here than outside the RequestHandler.
- EndpointAssociation.setEndpoint(endpoint);
-
- MessageStreamContext streamContext = new MessageStreamContext();
- copyProperties(invCtx, streamContext);
- adapter.handle(streamContext, inStream, outStream );
- }
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process request: " + e.getMessage(), e);
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /**
- * Handles HTTP get request. It obtains endpoint's address and constructs URL with <b>?wsdl</b> query string.
- * The constructed URL is used to create the input stream to read WSDL content from and submited to the user.
- * @param endpoint endpoint
- * @param outStream output stream
- * @param invCtx invocation context
- */
- public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext invCtx)
- {
- String endpointAddress = endpoint.getAddress();
- if (endpointAddress == null)
- throw new IllegalArgumentException("Invalid endpoint address: " + endpointAddress);
-
- InputStream inStream = null;
- try
- {
- URL wsdlUrl = new URL(endpointAddress + "?wsdl");
- inStream = wsdlUrl.openStream();
- IOUtils.copyStream(outStream, inStream);
- }
- catch (IOException e)
- {
- throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
- }
- finally
- {
- // close input stream when available
- try
- {
- if(inStream!=null) inStream.close();
- }
- catch (IOException ignore) {}
- // close output stream when available
- try
- {
- if(outStream!=null) outStream.close();
- }
- catch (IOException ignore) {}
- }
- }
-
- /**
- * Handles HTTP GET request using Metro's ServletAdapter <b>publishWSDL</b> method
- * @param target Metro's ServletAdapter
- * @param req request message
- * @param context servlet context
- * @param res response message
- * @throws ServletException if some problem occurs
- */
- private static void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
- throws ServletException
- {
- try
- {
- if (target != null)
- {
- String query = req.getQueryString();
- if (isMetadataQuery(query))
- {
- // Sends published WSDL and schema documents
- target.publishWSDL(context, req, res);
- return;
- }
- else
- {
- sendResponse(405, "HTTP GET not supported", res);
- }
- }
- else
- {
- sendResponse(404, "Not found", res);
- }
- }
- catch (Exception e)
- {
- log.error("Failed to process GET request", e);
- throw new ServletException(e.getMessage());
- }
- }
-
- /**
- * Handles HTTP POST request using Metro's ServletAdapter <b>handle</b> method
- * @param target Metro's ServletAdapter
- * @param req request message
- * @param context servlet context
- * @param res response message
- * @throws ServletException if some problem occurs
- */
- private static void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
- {
- try
- {
- target.handle(context, req, res);
- }
- catch (Throwable e)
- {
- log.error("Failed to process POST request", e);
- res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- }
- }
-
- /**
- * Copies properties from invocation context to message context when properties are available
- * @param invCtx invocation context
- * @param msgCtx message context
- */
- private static void copyProperties(InvocationContext invCtx, MessageStreamContext msgCtx)
- {
- boolean invCtxAvailable = (invCtx != null);
- boolean invCtxHasProps = (invCtx.getAttachment(Properties.class) != null);
-
- if (invCtxAvailable && invCtxHasProps)
- {
- Map<String, String> msgReqCtx = msgCtx.getRequestContext();
- Properties invCtxProps = invCtx.getAttachment(Properties.class);
-
- // copy invocation properties to message request context
- for(Object keyObject : invCtxProps.keySet())
- {
- String key = (String)keyObject;
- msgReqCtx.put(key, invCtxProps.getProperty(key));
- }
- }
- }
-
- /**
- * Sends HTTP text message to the client
- * @param status HTTP status code to return
- * @param message text message
- * @param res response to write message to
- * @throws IOException when some IO problem occurs
- */
- private static void sendResponse(int status, String message, HttpServletResponse res)
- throws IOException
- {
- res.setStatus(status);
- res.setContentType("text/plain");
- Writer out = res.getWriter();
- out.write(message);
- out.close();
- }
-
- /**
- * Returns true if the given query string is for metadata request.
- * @param query HTTP query, can be null
- * @return true for metadata requests false otherwise
- */
- private static boolean isMetadataQuery(String query)
- {
- // we intentionally return true even if documents don't exist, so that they get 404.
- return (query != null) && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,288 @@
+/*
+ * 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.wsf.stack.metro;
+
+//$Id$
+
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.IOUtils;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Map;
+import java.util.Properties;
+import java.net.URL;
+
+/**
+ * Request handler that delegates to Metro's ServletAdapter.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+class RequestHandlerImpl implements RequestHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
+
+ RequestHandlerImpl()
+ {
+ }
+
+ /**
+ * Handles HTTP requests. It supports <b>POST</b> and <b>GET</b> HTTP methods only.
+ * @param endpoint endpoint
+ * @param req servlet request to handle
+ * @param res servlet response to return
+ * @param servletCtx servlet context
+ * @throws ServletException when some problem occurs
+ * @throws IOException when some IO problem occurs
+ */
+ public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext servletCtx)
+ throws ServletException, IOException
+ {
+ ServletAdapter target = endpoint.getAttachment(ServletAdapter.class);
+ if(null == target)
+ throw new IllegalStateException("Cannot obtain ServletAdapter");
+
+ EndpointAssociation.setEndpoint(endpoint);
+ try
+ {
+ String method = req.getMethod();
+ if (method.equals("POST"))
+ {
+ doPost(target, servletCtx, req, res);
+ }
+ else if(method.equals("GET"))
+ {
+ doGet(target, req, servletCtx, res);
+ }
+ else
+ {
+ throw new WebServiceException("Unsupported method: " + method);
+ }
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /**
+ * The InvocationContext accepts a {@link Properties} attachment that can carry request properties.<br/>
+ * The properties keys are derived from {@link org.jboss.wsf.stack.metro.MessageStreamContext}
+ * @param endpoint endpoint
+ * @param inStream input stream
+ * @param outStream output stream
+ * @param invCtx invocation context
+ */
+ public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invCtx)
+ {
+ MessageStreamAdapter adapter = endpoint.getAttachment(MessageStreamAdapter.class);
+ if (adapter == null)
+ throw new IllegalStateException("Cannot obtain: " + adapter.getClass().getName());
+
+ try
+ {
+ // Hacky, but the InvokerJSE requires it.
+ // It's better to do it here than outside the RequestHandler.
+ EndpointAssociation.setEndpoint(endpoint);
+
+ MessageStreamContext streamContext = new MessageStreamContext();
+ copyProperties(invCtx, streamContext);
+ adapter.handle(streamContext, inStream, outStream );
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to process request: " + e.getMessage(), e);
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /**
+ * Handles HTTP get request. It obtains endpoint's address and constructs URL with <b>?wsdl</b> query string.
+ * The constructed URL is used to create the input stream to read WSDL content from and submited to the user.
+ * @param endpoint endpoint
+ * @param outStream output stream
+ * @param invCtx invocation context
+ */
+ public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext invCtx)
+ {
+ String endpointAddress = endpoint.getAddress();
+ if (endpointAddress == null)
+ throw new IllegalArgumentException("Invalid endpoint address: " + endpointAddress);
+
+ InputStream inStream = null;
+ try
+ {
+ URL wsdlUrl = new URL(endpointAddress + "?wsdl");
+ inStream = wsdlUrl.openStream();
+ IOUtils.copyStream(outStream, inStream);
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
+ }
+ finally
+ {
+ // close input stream when available
+ try
+ {
+ if(inStream!=null) inStream.close();
+ }
+ catch (IOException ignore) {}
+ // close output stream when available
+ try
+ {
+ if(outStream!=null) outStream.close();
+ }
+ catch (IOException ignore) {}
+ }
+ }
+
+ /**
+ * Handles HTTP GET request using Metro's ServletAdapter <b>publishWSDL</b> method
+ * @param target Metro's ServletAdapter
+ * @param req request message
+ * @param context servlet context
+ * @param res response message
+ * @throws ServletException if some problem occurs
+ */
+ private static void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res)
+ throws ServletException
+ {
+ try
+ {
+ if (target != null)
+ {
+ String query = req.getQueryString();
+ if (isMetadataQuery(query))
+ {
+ // Sends published WSDL and schema documents
+ target.publishWSDL(context, req, res);
+ return;
+ }
+ else
+ {
+ sendResponse(405, "HTTP GET not supported", res);
+ }
+ }
+ else
+ {
+ sendResponse(404, "Not found", res);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to process GET request", e);
+ throw new ServletException(e.getMessage());
+ }
+ }
+
+ /**
+ * Handles HTTP POST request using Metro's ServletAdapter <b>handle</b> method
+ * @param target Metro's ServletAdapter
+ * @param req request message
+ * @param context servlet context
+ * @param res response message
+ * @throws ServletException if some problem occurs
+ */
+ private static void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res)
+ {
+ try
+ {
+ target.handle(context, req, res);
+ }
+ catch (Throwable e)
+ {
+ log.error("Failed to process POST request", e);
+ res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Copies properties from invocation context to message context when properties are available
+ * @param invCtx invocation context
+ * @param msgCtx message context
+ */
+ private static void copyProperties(InvocationContext invCtx, MessageStreamContext msgCtx)
+ {
+ boolean invCtxAvailable = (invCtx != null);
+ boolean invCtxHasProps = (invCtx.getAttachment(Properties.class) != null);
+
+ if (invCtxAvailable && invCtxHasProps)
+ {
+ Map<String, String> msgReqCtx = msgCtx.getRequestContext();
+ Properties invCtxProps = invCtx.getAttachment(Properties.class);
+
+ // copy invocation properties to message request context
+ for(Object keyObject : invCtxProps.keySet())
+ {
+ String key = (String)keyObject;
+ msgReqCtx.put(key, invCtxProps.getProperty(key));
+ }
+ }
+ }
+
+ /**
+ * Sends HTTP text message to the client
+ * @param status HTTP status code to return
+ * @param message text message
+ * @param res response to write message to
+ * @throws IOException when some IO problem occurs
+ */
+ private static void sendResponse(int status, String message, HttpServletResponse res)
+ throws IOException
+ {
+ res.setStatus(status);
+ res.setContentType("text/plain");
+ Writer out = res.getWriter();
+ out.write(message);
+ out.close();
+ }
+
+ /**
+ * Returns true if the given query string is for metadata request.
+ * @param query HTTP query, can be null
+ * @return true for metadata requests false otherwise
+ */
+ private static boolean isMetadataQuery(String query)
+ {
+ // we intentionally return true even if documents don't exist, so that they get 404.
+ return (query != null) && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
+ }
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,65 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-// $Id$
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import com.sun.xml.ws.transport.http.ResourceLoader;
-
-/**
- * {@link ResourceLoader} backed by {@link ServletContext}.
- *
- * TDI: A copy of the original that is public
- *
- * @author WS Development Team
- * @author Thomas.Diesler(a)jboss.org
- */
-public class ServletResourceLoader implements ResourceLoader
-{
- private final ServletContext context;
-
- public ServletResourceLoader(ServletContext context)
- {
- this.context = context;
- }
-
- public URL getResource(String path) throws MalformedURLException
- {
- return context.getResource(path);
- }
-
- public URL getCatalogFile() throws MalformedURLException
- {
- return getResource("/WEB-INF/jax-ws-catalog.xml");
- }
-
- public Set<String> getResourcePaths(String path)
- {
- return context.getResourcePaths(path);
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,65 @@
+/*
+ * 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.wsf.stack.metro;
+
+// $Id$
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+
+/**
+ * {@link ResourceLoader} backed by {@link ServletContext}.
+ *
+ * TDI: A copy of the original that is public
+ *
+ * @author WS Development Team
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class ServletResourceLoader implements ResourceLoader
+{
+ private final ServletContext context;
+
+ public ServletResourceLoader(ServletContext context)
+ {
+ this.context = context;
+ }
+
+ public URL getResource(String path) throws MalformedURLException
+ {
+ return context.getResource(path);
+ }
+
+ public URL getCatalogFile() throws MalformedURLException
+ {
+ return getResource("/WEB-INF/jax-ws-catalog.xml");
+ }
+
+ public Set<String> getResourcePaths(String path)
+ {
+ return context.getResourcePaths(path);
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,117 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
-import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
-import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
-
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.SOAPBinding;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * An aspect that generates sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class SunJaxwsDeploymentAspect extends DeploymentAspect
-{
- @Override
- @SuppressWarnings("unchecked")
- public void create(Deployment dep, WSFRuntime runtime)
- {
- DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
- if (ddEndpoints == null)
- {
- ddEndpoints = new DDEndpoints();
- for (Endpoint endpoint : dep.getService().getEndpoints())
- {
- String endpointName = endpoint.getShortName();
- String targetBean = endpoint.getTargetBeanName();
- String urlPattern = endpoint.getURLPattern();
-
- DDEndpoint ddEndpoint = new DDEndpoint(endpointName, targetBean, urlPattern);
- Class beanClass = endpoint.getTargetBeanClass();
- BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
-
- if (bindingType != null && bindingType.value().length() > 0)
- {
- String binding = bindingType.value();
- ddEndpoint.setBinding(binding);
- ddEndpoint.setEnableMTOM(isMtomEnabled(binding));
- }
-
- log.info("Add " + ddEndpoint);
- ddEndpoints.addEndpoint(ddEndpoint);
- }
-
- dep.addAttachment(DDEndpoints.class, ddEndpoints);
- putSunJaxwsConfigToDeployment(dep, ddEndpoints.createFileURL());
- }
- }
-
- @Override
- public void destroy(Deployment dep, WSFRuntime runtime)
- {
- DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
- if (dd != null)
- {
- dd.destroyFileURL();
- }
- }
-
- /**
- * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
- * @param dep deployment where to put
- * @param dd beans to be put
- */
- private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL)
- {
- // get property map
- String propKey = "org.jboss.ws.webapp.ContextParameterMap";
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
- if (contextParams == null)
- {
- // if there's no associated map with the property create it now
- contextParams = new HashMap<String, String>();
- dep.setProperty(propKey, contextParams);
- }
- // put sun jaxws config URL to the property map
- contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm());
- }
-
- private static boolean isMtomEnabled(String binding)
- {
- return binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
- }
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,117 @@
+/*
+ * 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.wsf.stack.metro;
+
+//$Id$
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
+import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
+import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
+
+import javax.xml.ws.BindingType;
+import javax.xml.ws.soap.SOAPBinding;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * An aspect that generates sun-jaxws.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class SunJaxwsDeploymentAspect extends DeploymentAspect
+{
+ @Override
+ @SuppressWarnings("unchecked")
+ public void create(Deployment dep, WSFRuntime runtime)
+ {
+ DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
+ if (ddEndpoints == null)
+ {
+ ddEndpoints = new DDEndpoints();
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ String endpointName = endpoint.getShortName();
+ String targetBean = endpoint.getTargetBeanName();
+ String urlPattern = endpoint.getURLPattern();
+
+ DDEndpoint ddEndpoint = new DDEndpoint(endpointName, targetBean, urlPattern);
+ Class beanClass = endpoint.getTargetBeanClass();
+ BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
+
+ if (bindingType != null && bindingType.value().length() > 0)
+ {
+ String binding = bindingType.value();
+ ddEndpoint.setBinding(binding);
+ ddEndpoint.setEnableMTOM(isMtomEnabled(binding));
+ }
+
+ log.info("Add " + ddEndpoint);
+ ddEndpoints.addEndpoint(ddEndpoint);
+ }
+
+ dep.addAttachment(DDEndpoints.class, ddEndpoints);
+ putSunJaxwsConfigToDeployment(dep, ddEndpoints.createFileURL());
+ }
+ }
+
+ @Override
+ public void destroy(Deployment dep, WSFRuntime runtime)
+ {
+ DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
+ if (dd != null)
+ {
+ dd.destroyFileURL();
+ }
+ }
+
+ /**
+ * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
+ * @param dep deployment where to put
+ * @param dd beans to be put
+ */
+ private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL)
+ {
+ // get property map
+ String propKey = "org.jboss.ws.webapp.ContextParameterMap";
+ Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
+ if (contextParams == null)
+ {
+ // if there's no associated map with the property create it now
+ contextParams = new HashMap<String, String>();
+ dep.setProperty(propKey, contextParams);
+ }
+ // put sun jaxws config URL to the property map
+ contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm());
+ }
+
+ private static boolean isMtomEnabled(String binding)
+ {
+ return binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ }
+}
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,69 +0,0 @@
-/*
- * 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.wsf.stack.metro;
-
-import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.management.ObjectName;
-import java.util.Iterator;
-
-/**
- * Resolves Endpoints by Servlet name and web context path.
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class WebAppResolver implements EndpointResolver
-{
- private String contextPath;
- private String servletName;
-
- public WebAppResolver(String contextPath, String servletName)
- {
- this.contextPath = contextPath;
- this.servletName = servletName;
- }
-
- public Endpoint query(Iterator<Endpoint> endpoints)
- {
- Endpoint endpoint = null;
-
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
-
- while(endpoints.hasNext())
- {
- Endpoint auxEndpoint = endpoints.next();
- ObjectName sepId = auxEndpoint.getName();
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = auxEndpoint;
- break;
- }
- }
-
- return endpoint;
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,69 @@
+/*
+ * 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.wsf.stack.metro;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log)
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,167 +0,0 @@
-/*
- * 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.wsf.stack.metro.log;
-
-import com.sun.xml.ws.api.message.Packet;
-import com.sun.xml.ws.api.pipe.Pipe;
-import com.sun.xml.ws.api.pipe.PipeCloner;
-import com.sun.xml.ws.api.pipe.helper.AbstractFilterPipeImpl;
-import org.jboss.logging.Logger;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.Constructor;
-
-/**
- * {@link Pipe} that dumps messages that pass through.
- * Borrowed from the SUN-RI sources.
- *
- * @author Kohsuke Kawaguchi
- * @author Heiko Braun
- */
-public class DumpPipe extends AbstractFilterPipeImpl
-{
- private static Logger msgLog = Logger.getLogger("org.jboss.wsf.spi.MessageTrace");
-
- private final String name;
- private final PrintStream out;
- private final XMLOutputFactory staxOut;
-
- /**
- * @param name
- * Specify the name that identifies this {@link DumpPipe}
- * instance. This string will be printed when this pipe
- * dumps messages, and allows people to distinguish which
- * pipe instance is dumping a message when multiple
- * {@link DumpPipe}s print messages out.
- * @param out the output to send dumps to.
- * @param next the next {@link Pipe} in the pipeline.
- */
- public DumpPipe(String name, PrintStream out, Pipe next)
- {
- super(next);
- this.name = name;
- this.out = out;
- this.staxOut = XMLOutputFactory.newInstance();
- }
-
- /**
- * @param out the output to send dumps to.
- * @param next the next {@link Pipe} in the pipeline.
- * @deprecated use {@link #DumpPipe(String, PrintStream, Pipe)} instead
- */
- public DumpPipe(PrintStream out, Pipe next)
- {
- this("DumpPipe",out,next);
- }
-
- /**
- * Copy constructor.
- */
- private DumpPipe(DumpPipe that, PipeCloner cloner)
- {
- super(that,cloner);
- this.name = that.name;
- this.out = that.out;
- this.staxOut = that.staxOut;
- }
-
- public Packet process(Packet packet)
- {
- dump("request",packet);
- Packet reply = next.process(packet);
- dump("response",reply);
- return reply;
- }
-
- private void dump(String header, Packet packet)
- {
- if(!msgLog.isTraceEnabled())
- return;
-
- msgLog.trace("====[" + name + ":" + header + "]====");
- if(packet.getMessage() == null)
- {
- msgLog.trace("(none)");
- }
- else
- {
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try
- {
- XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout)
- {
- public void close()
- {
- // does nothing
- }
- });
- writer = createIndenter(writer);
- packet.getMessage().copy().writeTo(writer);
- writer.close();
- }
- catch (XMLStreamException e)
- {
- e.printStackTrace(new PrintStream(bout));
- }
-
- msgLog.trace(new String(bout.toByteArray()));
- }
- msgLog.trace("============");
- }
-
- /**
- * Wraps {@link XMLStreamWriter} by an indentation engine if available.
- * <p>
- * We can do this only if we have <tt>stax-utils.jar</tt> on the classpath.
- * </p>
- */
- @SuppressWarnings("unchecked")
- private XMLStreamWriter createIndenter(XMLStreamWriter writer)
- {
- try
- {
- Class clazz = getClass().getClassLoader().loadClass("javanet.staxutils.IndentingXMLStreamWriter");
- Constructor c = clazz.getConstructor(XMLStreamWriter.class);
- writer = (XMLStreamWriter)c.newInstance(writer);
- }
- catch (Exception e)
- {
- msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent dumped output");
- }
- return writer;
- }
-
- public Pipe copy(PipeCloner cloner)
- {
- return new DumpPipe(this, cloner);
- }
-
- public void preDestroy()
- {
- // does nothing
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,167 @@
+/*
+ * 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.wsf.stack.metro.log;
+
+import com.sun.xml.ws.api.message.Packet;
+import com.sun.xml.ws.api.pipe.Pipe;
+import com.sun.xml.ws.api.pipe.PipeCloner;
+import com.sun.xml.ws.api.pipe.helper.AbstractFilterPipeImpl;
+import org.jboss.logging.Logger;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Constructor;
+
+/**
+ * {@link Pipe} that dumps messages that pass through.
+ * Borrowed from the SUN-RI sources.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Heiko Braun
+ */
+public class DumpPipe extends AbstractFilterPipeImpl
+{
+ private static Logger msgLog = Logger.getLogger("org.jboss.wsf.spi.MessageTrace");
+
+ private final String name;
+ private final PrintStream out;
+ private final XMLOutputFactory staxOut;
+
+ /**
+ * @param name
+ * Specify the name that identifies this {@link DumpPipe}
+ * instance. This string will be printed when this pipe
+ * dumps messages, and allows people to distinguish which
+ * pipe instance is dumping a message when multiple
+ * {@link DumpPipe}s print messages out.
+ * @param out the output to send dumps to.
+ * @param next the next {@link Pipe} in the pipeline.
+ */
+ public DumpPipe(String name, PrintStream out, Pipe next)
+ {
+ super(next);
+ this.name = name;
+ this.out = out;
+ this.staxOut = XMLOutputFactory.newInstance();
+ }
+
+ /**
+ * @param out the output to send dumps to.
+ * @param next the next {@link Pipe} in the pipeline.
+ * @deprecated use {@link #DumpPipe(String, PrintStream, Pipe)} instead
+ */
+ public DumpPipe(PrintStream out, Pipe next)
+ {
+ this("DumpPipe",out,next);
+ }
+
+ /**
+ * Copy constructor.
+ */
+ private DumpPipe(DumpPipe that, PipeCloner cloner)
+ {
+ super(that,cloner);
+ this.name = that.name;
+ this.out = that.out;
+ this.staxOut = that.staxOut;
+ }
+
+ public Packet process(Packet packet)
+ {
+ dump("request",packet);
+ Packet reply = next.process(packet);
+ dump("response",reply);
+ return reply;
+ }
+
+ private void dump(String header, Packet packet)
+ {
+ if(!msgLog.isTraceEnabled())
+ return;
+
+ msgLog.trace("====[" + name + ":" + header + "]====");
+ if(packet.getMessage() == null)
+ {
+ msgLog.trace("(none)");
+ }
+ else
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ try
+ {
+ XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout)
+ {
+ public void close()
+ {
+ // does nothing
+ }
+ });
+ writer = createIndenter(writer);
+ packet.getMessage().copy().writeTo(writer);
+ writer.close();
+ }
+ catch (XMLStreamException e)
+ {
+ e.printStackTrace(new PrintStream(bout));
+ }
+
+ msgLog.trace(new String(bout.toByteArray()));
+ }
+ msgLog.trace("============");
+ }
+
+ /**
+ * Wraps {@link XMLStreamWriter} by an indentation engine if available.
+ * <p>
+ * We can do this only if we have <tt>stax-utils.jar</tt> on the classpath.
+ * </p>
+ */
+ @SuppressWarnings("unchecked")
+ private XMLStreamWriter createIndenter(XMLStreamWriter writer)
+ {
+ try
+ {
+ Class clazz = getClass().getClassLoader().loadClass("javanet.staxutils.IndentingXMLStreamWriter");
+ Constructor c = clazz.getConstructor(XMLStreamWriter.class);
+ writer = (XMLStreamWriter)c.newInstance(writer);
+ }
+ catch (Exception e)
+ {
+ msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent dumped output");
+ }
+ return writer;
+ }
+
+ public Pipe copy(PipeCloner cloner)
+ {
+ return new DumpPipe(this, cloner);
+ }
+
+ public void preDestroy()
+ {
+ // does nothing
+ }
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,38 +0,0 @@
-/*
- * 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.wsf.stack.metro.log;
-
-import com.sun.xml.ws.api.server.ServerPipelineHook;
-import com.sun.xml.ws.api.pipe.Pipe;
-import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class MessageLogPipelineHook extends ServerPipelineHook
-{
- public Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, Pipe tail)
- {
- return new DumpPipe("Message Log", System.out, tail);
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,38 @@
+/*
+ * 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.wsf.stack.metro.log;
+
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.api.pipe.Pipe;
+import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class MessageLogPipelineHook extends ServerPipelineHook
+{
+ public Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, Pipe tail)
+ {
+ return new DumpPipe("Message Log", System.out, tail);
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,96 +0,0 @@
-/*
- * 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.wsf.stack.metro.log;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.logging.Filter;
-import java.util.logging.LogRecord;
-
-/**
- * A log filter allowing logging of LogRecord depending on the
- * namespace of the Logger they have been collected by.
- *
- * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
- * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
- * @since 14-Jun-2007
- *
- */
-public class NamespaceFilter implements Filter
-{
-
- private Set<String> namespaces;
- private boolean show;
-
- public NamespaceFilter(boolean show)
- {
- this.show = show;
- }
-
- public boolean isLoggable(LogRecord record)
- {
- String loggerName = record.getLoggerName();
- if (loggerName == null)
- {
- return true;
- }
- else
- {
- for (String ns : namespaces)
- {
- if (loggerName.startsWith(ns))
- {
- return show;
- }
- }
- return !show;
- }
- }
-
- public void addNamespace(String ns)
- {
- if (namespaces == null)
- namespaces = new LinkedHashSet<String>();
- namespaces.add(ns);
- }
-
- public Set<String> getNamespaces()
- {
- return namespaces;
- }
-
- public void setNamespaces(Set<String> namespaces)
- {
- this.namespaces = namespaces;
- }
-
- public boolean isShow()
- {
- return show;
- }
-
- public void setShow(boolean show)
- {
- this.show = show;
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,96 @@
+/*
+ * 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.wsf.stack.metro.log;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.logging.Filter;
+import java.util.logging.LogRecord;
+
+/**
+ * A log filter allowing logging of LogRecord depending on the
+ * namespace of the Logger they have been collected by.
+ *
+ * @author Alessio Soldano, <alessio.soldano(a)javalinux.it>
+ * @author Stefano Maestri, <stefano.maestri(a)javalinux.it>
+ * @since 14-Jun-2007
+ *
+ */
+public class NamespaceFilter implements Filter
+{
+
+ private Set<String> namespaces;
+ private boolean show;
+
+ public NamespaceFilter(boolean show)
+ {
+ this.show = show;
+ }
+
+ public boolean isLoggable(LogRecord record)
+ {
+ String loggerName = record.getLoggerName();
+ if (loggerName == null)
+ {
+ return true;
+ }
+ else
+ {
+ for (String ns : namespaces)
+ {
+ if (loggerName.startsWith(ns))
+ {
+ return show;
+ }
+ }
+ return !show;
+ }
+ }
+
+ public void addNamespace(String ns)
+ {
+ if (namespaces == null)
+ namespaces = new LinkedHashSet<String>();
+ namespaces.add(ns);
+ }
+
+ public Set<String> getNamespaces()
+ {
+ return namespaces;
+ }
+
+ public void setNamespaces(Set<String> namespaces)
+ {
+ this.namespaces = namespaces;
+ }
+
+ public boolean isShow()
+ {
+ return show;
+ }
+
+ public void setShow(boolean show)
+ {
+ this.show = show;
+ }
+
+}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata)
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,193 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata;
-
-import com.sun.xml.ws.transport.http.ResourceLoader;
-
-import javax.servlet.ServletContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import java.net.URL;
-import java.util.Set;
-import java.util.Enumeration;
-import java.io.InputStream;
-
-/**
- * This ServletContext implementation provides access to resources only.
- * Other methods are not implemented at all.
- *
- * @author richard.opalka(a)jboss.com
- */
-public class FakeServletContext implements ServletContext
-{
- private ResourceLoader resourceLoader;
-
- public FakeServletContext(ResourceLoader resourceLoader)
- {
- this.resourceLoader = resourceLoader;
- }
-
- public URL getResource(String name)
- {
- try
- {
- return resourceLoader.getResource(name);
- }
- catch (Throwable e)
- {
- return null;
- }
- }
-
- public InputStream getResourceAsStream(String string)
- {
- try
- {
- return getResource(string).openStream();
- }
- catch (Throwable e)
- {
- return null;
- }
- }
-
- public ServletContext getContext(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public String getContextPath()
- {
- throw new UnsupportedOperationException();
- }
-
- public int getMajorVersion()
- {
- throw new UnsupportedOperationException();
- }
-
- public int getMinorVersion()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getMimeType(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public Set getResourcePaths(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public RequestDispatcher getRequestDispatcher(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public RequestDispatcher getNamedDispatcher(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public Servlet getServlet(String string) throws ServletException
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getServlets()
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getServletNames()
- {
- throw new UnsupportedOperationException();
- }
-
- public void log(String string)
- {
- // does nothing
- }
-
- public void log(Exception exception, String string)
- {
- // does nothing
- }
-
- public void log(String string, Throwable throwable)
- {
- // does nothing
- }
-
- public String getRealPath(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public String getServerInfo()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getInitParameter(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getInitParameterNames()
- {
- throw new UnsupportedOperationException();
- }
-
- public Object getAttribute(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getAttributeNames()
- {
- throw new UnsupportedOperationException();
- }
-
- public void setAttribute(String string, Object object)
- {
- throw new UnsupportedOperationException();
- }
-
- public void removeAttribute(String string)
- {
- throw new UnsupportedOperationException();
- }
-
- public String getServletContextName()
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/FakeServletContext.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,193 @@
+/*
+ * 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.wsf.stack.metro.metadata;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+
+import javax.servlet.ServletContext;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import java.net.URL;
+import java.util.Set;
+import java.util.Enumeration;
+import java.io.InputStream;
+
+/**
+ * This ServletContext implementation provides access to resources only.
+ * Other methods are not implemented at all.
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public class FakeServletContext implements ServletContext
+{
+ private ResourceLoader resourceLoader;
+
+ public FakeServletContext(ResourceLoader resourceLoader)
+ {
+ this.resourceLoader = resourceLoader;
+ }
+
+ public URL getResource(String name)
+ {
+ try
+ {
+ return resourceLoader.getResource(name);
+ }
+ catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public InputStream getResourceAsStream(String string)
+ {
+ try
+ {
+ return getResource(string).openStream();
+ }
+ catch (Throwable e)
+ {
+ return null;
+ }
+ }
+
+ public ServletContext getContext(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContextPath()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getMajorVersion()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getMinorVersion()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getMimeType(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set getResourcePaths(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public RequestDispatcher getRequestDispatcher(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public RequestDispatcher getNamedDispatcher(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Servlet getServlet(String string) throws ServletException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getServlets()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getServletNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void log(String string)
+ {
+ // does nothing
+ }
+
+ public void log(Exception exception, String string)
+ {
+ // does nothing
+ }
+
+ public void log(String string, Throwable throwable)
+ {
+ // does nothing
+ }
+
+ public String getRealPath(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getServerInfo()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getInitParameter(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getInitParameterNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object getAttribute(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getAttributeNames()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setAttribute(String string, Object object)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void removeAttribute(String string)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getServletContextName()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,223 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata;
-
-import com.sun.xml.ws.api.server.BoundEndpoint;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.Module;
-import com.sun.xml.ws.api.server.ResourceInjector;
-import com.sun.xml.ws.api.server.ServerPipelineHook;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.ResourceLoaderAdapter;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
-import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
-import org.jboss.wsf.stack.metro.MessageStreamAdapter;
-import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook;
-
-import javax.xml.ws.WebServiceException;
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-/**
- * Creates a Metro runtime model and associates it with the deployment.
- * Doing so requires a valid runtime loader present, that will act as a temporary
- * thread local classloader. <p>The <code>spi.Endpoint</code> carries a Metro <code>ServletAdapter</code>
- * that is associated with the runtime model:<br>
- * <code>(Endpoint.getAttachment(ServletAdapter.class))</code>
- * This adapter acts as the main entry point for SOAP/HTTP requests.
- * Please note that the current implementation doesnt support the stream based RequestHandler API.
- *
- * @see org.jboss.wsf.stack.metro.RequestHandlerImpl
- * @see org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt
- *
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class RuntimeModelDeploymentAspect extends DeploymentAspect
-{
- private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class);
- protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
- public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
-
- public void start(Deployment deployment, WSFRuntime runtime)
- {
- ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
- if(null == runtimeLoader)
- throw new IllegalArgumentException("Null runtimeLoader");
-
- ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- // Metro uses the thread context classloader in several places
- Thread.currentThread().setContextClassLoader(runtimeLoader);
-
- UnifiedVirtualFile vfsRoot = null;
- if (deployment instanceof ArchiveDeployment)
- {
- vfsRoot = ((ArchiveDeployment)deployment).getRootFile();
- }
- else
- {
- vfsRoot = new ResourceLoaderAdapter(runtimeLoader);
- }
-
- ResourceLoader resourceLoader = new VFSResourceLoader(vfsRoot);
- JBossWSContainer container = new JBossWSContainer(resourceLoader);
-
- // TODO: refactor to general HTTPAdapter usage
- ServletAdapterList adapterList = new ServletAdapterList();
-
- // Parse the descriptor file and build endpoint infos
- DeploymentDescriptorParserExt<ServletAdapter> parser =
- createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
-
- URL sunJaxWsXml = getDDUrlFromContext(deployment);
-
- List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
-
- for(ServletAdapter adapter : adapters)
- {
- for(Endpoint ep : deployment.getService().getEndpoints())
- {
- // TODO matching need to be improved
- boolean nameEquals = ep.getShortName().equals(adapter.getName());
- boolean beanEquals = ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass());
- if(nameEquals && beanEquals)
- {
- MessageStreamAdapter msgStreamAdapter = MessageStreamAdapter.FACTORY.createAdapter(adapter.getName(), null, adapter.getEndpoint());
- // TODO JBWS-1869: Support stream based RequestHandler API
- ep.addAttachment(MessageStreamAdapter.class, msgStreamAdapter);
- ep.addAttachment(ServletAdapter.class, adapter);
- break;
- }
- }
- }
- }
- catch (Throwable e)
- {
- throw new WebServiceException("Failed to build METRO runtime model", e);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(origClassLoader);
- }
- }
-
- @SuppressWarnings("unchecked")
- private URL getDDUrlFromContext(Deployment deployment) throws MalformedURLException
- {
- Map<String, String> contextProperties =
- (Map<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
-
- return new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
- }
-
- /**
- * Externalized for integration
- */
- protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser
- (
- ClassLoader classLoader,
- JBossWSContainer container,
- ResourceLoader resourceLoader,
- DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList
- )
- throws MalformedURLException
- {
- return new DeploymentDescriptorParserJBWS<ServletAdapter>
- (
- classLoader, resourceLoader, container, adapterList
- );
- }
-
- /**
- * Externalized for integration
- */
- protected URL getDDUrlFromResourceLoader(UnifiedVirtualFile vfsRoot) throws IOException
- {
- return vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL();
- }
-
- /**
- * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}.
- * Pipes can get ServletContext from Container and use it to load some resources.
- */
- private static class JBossWSContainer extends Container
- {
- private ResourceLoader resourceLoader;
- private Module module = new Module()
- {
- private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
-
- public List<BoundEndpoint> getBoundEndpoints()
- {
- return endpoints;
- }
- };
-
- JBossWSContainer(ResourceLoader loader)
- {
- this.resourceLoader = loader;
- }
-
- @SuppressWarnings("unchecked")
- public <T> T getSPI(Class<T> spiType)
- {
- if (spiType == Module.class)
- {
- return spiType.cast(module);
- }
- if(spiType == ResourceInjector.class)
- {
- return (T)ResourceInjector.STANDALONE;
- }
- if (spiType == ServerPipelineHook.class)
- {
- return (T)new MessageLogPipelineHook();
- }
- if(spiType == ServletContext.class)
- {
- return (T)new FakeServletContext(resourceLoader);
- }
-
- log.warn("Unable to resolve SPI for type: " + spiType);
- return null;
- }
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,223 @@
+/*
+ * 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.wsf.stack.metro.metadata;
+
+import com.sun.xml.ws.api.server.BoundEndpoint;
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.Module;
+import com.sun.xml.ws.api.server.ResourceInjector;
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
+import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
+import org.jboss.wsf.stack.metro.MessageStreamAdapter;
+import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook;
+
+import javax.xml.ws.WebServiceException;
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Creates a Metro runtime model and associates it with the deployment.
+ * Doing so requires a valid runtime loader present, that will act as a temporary
+ * thread local classloader. <p>The <code>spi.Endpoint</code> carries a Metro <code>ServletAdapter</code>
+ * that is associated with the runtime model:<br>
+ * <code>(Endpoint.getAttachment(ServletAdapter.class))</code>
+ * This adapter acts as the main entry point for SOAP/HTTP requests.
+ * Please note that the current implementation doesnt support the stream based RequestHandler API.
+ *
+ * @see org.jboss.wsf.stack.metro.RequestHandlerImpl
+ * @see org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class RuntimeModelDeploymentAspect extends DeploymentAspect
+{
+ private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class);
+ protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
+ public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
+
+ public void start(Deployment deployment, WSFRuntime runtime)
+ {
+ ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
+ if(null == runtimeLoader)
+ throw new IllegalArgumentException("Null runtimeLoader");
+
+ ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ // Metro uses the thread context classloader in several places
+ Thread.currentThread().setContextClassLoader(runtimeLoader);
+
+ UnifiedVirtualFile vfsRoot = null;
+ if (deployment instanceof ArchiveDeployment)
+ {
+ vfsRoot = ((ArchiveDeployment)deployment).getRootFile();
+ }
+ else
+ {
+ vfsRoot = new ResourceLoaderAdapter(runtimeLoader);
+ }
+
+ ResourceLoader resourceLoader = new VFSResourceLoader(vfsRoot);
+ JBossWSContainer container = new JBossWSContainer(resourceLoader);
+
+ // TODO: refactor to general HTTPAdapter usage
+ ServletAdapterList adapterList = new ServletAdapterList();
+
+ // Parse the descriptor file and build endpoint infos
+ DeploymentDescriptorParserExt<ServletAdapter> parser =
+ createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
+
+ URL sunJaxWsXml = getDDUrlFromContext(deployment);
+
+ List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
+
+ for(ServletAdapter adapter : adapters)
+ {
+ for(Endpoint ep : deployment.getService().getEndpoints())
+ {
+ // TODO matching need to be improved
+ boolean nameEquals = ep.getShortName().equals(adapter.getName());
+ boolean beanEquals = ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass());
+ if(nameEquals && beanEquals)
+ {
+ MessageStreamAdapter msgStreamAdapter = MessageStreamAdapter.FACTORY.createAdapter(adapter.getName(), null, adapter.getEndpoint());
+ // TODO JBWS-1869: Support stream based RequestHandler API
+ ep.addAttachment(MessageStreamAdapter.class, msgStreamAdapter);
+ ep.addAttachment(ServletAdapter.class, adapter);
+ break;
+ }
+ }
+ }
+ }
+ catch (Throwable e)
+ {
+ throw new WebServiceException("Failed to build METRO runtime model", e);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(origClassLoader);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private URL getDDUrlFromContext(Deployment deployment) throws MalformedURLException
+ {
+ Map<String, String> contextProperties =
+ (Map<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
+
+ return new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
+ }
+
+ /**
+ * Externalized for integration
+ */
+ protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser
+ (
+ ClassLoader classLoader,
+ JBossWSContainer container,
+ ResourceLoader resourceLoader,
+ DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList
+ )
+ throws MalformedURLException
+ {
+ return new DeploymentDescriptorParserJBWS<ServletAdapter>
+ (
+ classLoader, resourceLoader, container, adapterList
+ );
+ }
+
+ /**
+ * Externalized for integration
+ */
+ protected URL getDDUrlFromResourceLoader(UnifiedVirtualFile vfsRoot) throws IOException
+ {
+ return vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL();
+ }
+
+ /**
+ * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}.
+ * Pipes can get ServletContext from Container and use it to load some resources.
+ */
+ private static class JBossWSContainer extends Container
+ {
+ private ResourceLoader resourceLoader;
+ private Module module = new Module()
+ {
+ private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
+
+ public List<BoundEndpoint> getBoundEndpoints()
+ {
+ return endpoints;
+ }
+ };
+
+ JBossWSContainer(ResourceLoader loader)
+ {
+ this.resourceLoader = loader;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T getSPI(Class<T> spiType)
+ {
+ if (spiType == Module.class)
+ {
+ return spiType.cast(module);
+ }
+ if(spiType == ResourceInjector.class)
+ {
+ return (T)ResourceInjector.STANDALONE;
+ }
+ if (spiType == ServerPipelineHook.class)
+ {
+ return (T)new MessageLogPipelineHook();
+ }
+ if(spiType == ServletContext.class)
+ {
+ return (T)new FakeServletContext(resourceLoader);
+ }
+
+ log.warn("Unable to resolve SPI for type: " + spiType);
+ return null;
+ }
+ }
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,159 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata;
-
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.logging.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class VFSResourceLoader implements ResourceLoader
-{
-
- private static final Logger log = Logger.getLogger(VFSResourceLoader.class);
-
- UnifiedVirtualFile vfs;
-
- public VFSResourceLoader(UnifiedVirtualFile vfs)
- {
- this.vfs = vfs;
- }
-
- public URL getResource(String path) throws MalformedURLException
- {
- try
- {
- if(path.startsWith("/"))
- path = path.substring(1, path.length());
-
- return vfs.findChild(path).toURL();
- }
- catch (IOException e)
- {
- throw new MalformedURLException(e.getMessage());
- }
- }
-
- public URL getCatalogFile() throws MalformedURLException
- {
- URL resource = null;
- try
- {
- resource = getResource("/WEB-INF/jax-ws-catalog.xml");
- }
- catch (MalformedURLException e)
- {
- // ingore
- }
- return resource;
- }
-
- public Set<String> getResourcePaths(String path)
- {
- Set<String> resources = new HashSet<String>();
-
- try
- {
- URL rootUrl = getResource(path);
- if(rootUrl.getProtocol().equals("jar"))
- {
- /*String urlString = rootUrl.toExternalForm();
- String jarRoot = urlString.substring(4, urlString.indexOf("jar!")+3);
-
- File jar = new File(jarRoot);
- assert jar.exists();
- JarFile jarFile = new JarFile(jar);
-
- List<String> jarResources = getJARResources(jarFile, path);
-
- resources.addAll(jarResources);*/
- log.warn("Cannot collect resourcePaths from EJB jar");
- }
- else
- {
- File root = new File( rootUrl.toURI() );
- List<String> fileResources = getFileResources(root, path);
- resources.addAll(fileResources);
- }
- }
- catch (Exception e)
- {
- log.error("Failed to read resource paths from '"+path+"': ", e);
- }
-
- return resources;
- }
-
- private static List<String> getFileResources(File root, String path)
- {
- List<String> resources = new ArrayList<String>();
-
- if(root.exists())
- {
- File[] files = root.listFiles();
- if (files != null) {
- for( File f : files) {
- if(f.isDirectory()) {
- resources.add(path+f.getName()+'/');
- } else {
- resources.add(path+f.getName());
- }
- }
- }
- }
- return resources;
- }
-
- private static List<String> getJARResources(JarFile jarFile, String path) {
- List<String> resources = new ArrayList<String>();
-
- Enumeration entries = jarFile.entries();
- while (entries.hasMoreElements()) {
- JarEntry entry = (JarEntry) entries.nextElement();
- String entryName = entry.getName();
-
- if (entryName.matches(".*?\\.xml$")
- || entryName.matches(".*?\\.wsdl$")
- || entryName.matches(".*?\\.xsd$"))
- {
- resources.add(entryName);
- }
- }
-
- return resources;
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,159 @@
+/*
+ * 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.wsf.stack.metro.metadata;
+
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.logging.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.jar.JarFile;
+import java.util.jar.JarEntry;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class VFSResourceLoader implements ResourceLoader
+{
+
+ private static final Logger log = Logger.getLogger(VFSResourceLoader.class);
+
+ UnifiedVirtualFile vfs;
+
+ public VFSResourceLoader(UnifiedVirtualFile vfs)
+ {
+ this.vfs = vfs;
+ }
+
+ public URL getResource(String path) throws MalformedURLException
+ {
+ try
+ {
+ if(path.startsWith("/"))
+ path = path.substring(1, path.length());
+
+ return vfs.findChild(path).toURL();
+ }
+ catch (IOException e)
+ {
+ throw new MalformedURLException(e.getMessage());
+ }
+ }
+
+ public URL getCatalogFile() throws MalformedURLException
+ {
+ URL resource = null;
+ try
+ {
+ resource = getResource("/WEB-INF/jax-ws-catalog.xml");
+ }
+ catch (MalformedURLException e)
+ {
+ // ingore
+ }
+ return resource;
+ }
+
+ public Set<String> getResourcePaths(String path)
+ {
+ Set<String> resources = new HashSet<String>();
+
+ try
+ {
+ URL rootUrl = getResource(path);
+ if(rootUrl.getProtocol().equals("jar"))
+ {
+ /*String urlString = rootUrl.toExternalForm();
+ String jarRoot = urlString.substring(4, urlString.indexOf("jar!")+3);
+
+ File jar = new File(jarRoot);
+ assert jar.exists();
+ JarFile jarFile = new JarFile(jar);
+
+ List<String> jarResources = getJARResources(jarFile, path);
+
+ resources.addAll(jarResources);*/
+ log.warn("Cannot collect resourcePaths from EJB jar");
+ }
+ else
+ {
+ File root = new File( rootUrl.toURI() );
+ List<String> fileResources = getFileResources(root, path);
+ resources.addAll(fileResources);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to read resource paths from '"+path+"': ", e);
+ }
+
+ return resources;
+ }
+
+ private static List<String> getFileResources(File root, String path)
+ {
+ List<String> resources = new ArrayList<String>();
+
+ if(root.exists())
+ {
+ File[] files = root.listFiles();
+ if (files != null) {
+ for( File f : files) {
+ if(f.isDirectory()) {
+ resources.add(path+f.getName()+'/');
+ } else {
+ resources.add(path+f.getName());
+ }
+ }
+ }
+ }
+ return resources;
+ }
+
+ private static List<String> getJARResources(JarFile jarFile, String path) {
+ List<String> resources = new ArrayList<String>();
+
+ Enumeration entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry entry = (JarEntry) entries.nextElement();
+ String entryName = entry.getName();
+
+ if (entryName.matches(".*?\\.xml$")
+ || entryName.matches(".*?\\.wsdl$")
+ || entryName.matches(".*?\\.xsd$"))
+ {
+ resources.add(entryName);
+ }
+ }
+
+ return resources;
+ }
+}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws)
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,205 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata.sunjaxws;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-
-//$Id$
-
-/**
- * Metadata model for sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DDEndpoint
-{
- // Name of the endpoint
- private String name;
- // Primary wsdl file location in the WAR file.
- private String wsdl;
- //QName of WSDL service.
- private QName service;
- //QName of WSDL port.
- private QName port;
- // Endpoint implementation class name.
- private String implementation;
- // Should match <url-pattern> in web.xml
- private String urlPattern;
- // Binding id defined in the JAX-WS API
- private String binding;
- // Enables MTOM optimization.
- private boolean enableMTOM;
- // Optional handler chain
- private DDHandlerChain handlerChain;
-
- // The list of valid bindings
- static final List<String> validBindings = new ArrayList<String>();
- static
- {
- validBindings.add(SOAPBinding.SOAP11HTTP_BINDING);
- validBindings.add(SOAPBinding.SOAP11HTTP_MTOM_BINDING);
- validBindings.add(SOAPBinding.SOAP12HTTP_BINDING);
- validBindings.add(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
- validBindings.add(HTTPBinding.HTTP_BINDING);
- }
-
- public DDEndpoint(String name, String impl, String urlPattern)
- {
- if (name == null || name.length() == 0)
- throw new IllegalArgumentException("name cannot be null");
- if (impl == null || impl.length() == 0)
- throw new IllegalArgumentException("implementation cannot be null");
- if (urlPattern == null || urlPattern.length() == 0)
- throw new IllegalArgumentException("urlPattern cannot be null");
-
- this.name = name;
- this.implementation = impl;
- this.urlPattern = urlPattern;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getImplementation()
- {
- return implementation;
- }
-
- public String getUrlPattern()
- {
- return urlPattern;
- }
-
- public String getBinding()
- {
- return binding;
- }
-
- public void setBinding(String binding)
- {
- if (validBindings.contains(binding) == false)
- throw new IllegalArgumentException("Invalid binding: " + binding);
-
- this.binding = binding;
- }
-
- public boolean isEnableMTOM()
- {
- return enableMTOM;
- }
-
- public void setEnableMTOM(boolean enableMTOM)
- {
- this.enableMTOM = enableMTOM;
- }
-
- public QName getPort()
- {
- return port;
- }
-
- public void setPort(QName port)
- {
- this.port = port;
- }
-
- public QName getService()
- {
- return service;
- }
-
- public void setService(QName service)
- {
- this.service = service;
- }
-
- public String getWsdl()
- {
- return wsdl;
- }
-
- public void setWsdl(String wsdl)
- {
- this.wsdl = wsdl;
- }
-
- public DDHandlerChain getHandlerChain()
- {
- return handlerChain;
- }
-
- public void setHandlerChain(DDHandlerChain handlerChain)
- {
- this.handlerChain = handlerChain;
- }
-
- public void writeTo(Writer writer) throws IOException
- {
- writer.write("<endpoint");
- writer.write(" name='" + name + "'");
- writer.write(" implementation='" + implementation + "'");
- writer.write(" url-pattern='" + urlPattern + "'");
- if (service != null)
- writer.write(" service='" + service + "'");
- if (port != null)
- writer.write(" port='" + port + "'");
- if (wsdl != null)
- writer.write(" wsdl='" + wsdl + "'");
- if (binding != null)
- writer.write(" binding='" + binding + "'");
- writer.write(" enable-mtom='" + enableMTOM + "'");
- writer.write(">");
-
- if (handlerChain != null)
- handlerChain.writeTo(writer);
-
- writer.write("</endpoint>");
- }
-
- public String toString()
- {
- StringBuilder str = new StringBuilder("Endpoint");
- str.append("\n name=" + name);
- str.append("\n implementation=" + implementation);
- str.append("\n url-pattern=" + urlPattern);
- if (service != null)
- str.append("\n service=" + service);
- if (port != null)
- str.append("\n port=" + port);
- if (wsdl != null)
- str.append("\n wsdl=" + wsdl);
- if (binding != null)
- str.append("\n binding=" + binding);
- str.append("\n enable-mtom=" + enableMTOM);
- return str.toString();
- }
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,205 @@
+/*
+ * 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.wsf.stack.metro.metadata.sunjaxws;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.SOAPBinding;
+
+//$Id$
+
+/**
+ * Metadata model for sun-jaxws.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DDEndpoint
+{
+ // Name of the endpoint
+ private String name;
+ // Primary wsdl file location in the WAR file.
+ private String wsdl;
+ //QName of WSDL service.
+ private QName service;
+ //QName of WSDL port.
+ private QName port;
+ // Endpoint implementation class name.
+ private String implementation;
+ // Should match <url-pattern> in web.xml
+ private String urlPattern;
+ // Binding id defined in the JAX-WS API
+ private String binding;
+ // Enables MTOM optimization.
+ private boolean enableMTOM;
+ // Optional handler chain
+ private DDHandlerChain handlerChain;
+
+ // The list of valid bindings
+ static final List<String> validBindings = new ArrayList<String>();
+ static
+ {
+ validBindings.add(SOAPBinding.SOAP11HTTP_BINDING);
+ validBindings.add(SOAPBinding.SOAP11HTTP_MTOM_BINDING);
+ validBindings.add(SOAPBinding.SOAP12HTTP_BINDING);
+ validBindings.add(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ validBindings.add(HTTPBinding.HTTP_BINDING);
+ }
+
+ public DDEndpoint(String name, String impl, String urlPattern)
+ {
+ if (name == null || name.length() == 0)
+ throw new IllegalArgumentException("name cannot be null");
+ if (impl == null || impl.length() == 0)
+ throw new IllegalArgumentException("implementation cannot be null");
+ if (urlPattern == null || urlPattern.length() == 0)
+ throw new IllegalArgumentException("urlPattern cannot be null");
+
+ this.name = name;
+ this.implementation = impl;
+ this.urlPattern = urlPattern;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getImplementation()
+ {
+ return implementation;
+ }
+
+ public String getUrlPattern()
+ {
+ return urlPattern;
+ }
+
+ public String getBinding()
+ {
+ return binding;
+ }
+
+ public void setBinding(String binding)
+ {
+ if (validBindings.contains(binding) == false)
+ throw new IllegalArgumentException("Invalid binding: " + binding);
+
+ this.binding = binding;
+ }
+
+ public boolean isEnableMTOM()
+ {
+ return enableMTOM;
+ }
+
+ public void setEnableMTOM(boolean enableMTOM)
+ {
+ this.enableMTOM = enableMTOM;
+ }
+
+ public QName getPort()
+ {
+ return port;
+ }
+
+ public void setPort(QName port)
+ {
+ this.port = port;
+ }
+
+ public QName getService()
+ {
+ return service;
+ }
+
+ public void setService(QName service)
+ {
+ this.service = service;
+ }
+
+ public String getWsdl()
+ {
+ return wsdl;
+ }
+
+ public void setWsdl(String wsdl)
+ {
+ this.wsdl = wsdl;
+ }
+
+ public DDHandlerChain getHandlerChain()
+ {
+ return handlerChain;
+ }
+
+ public void setHandlerChain(DDHandlerChain handlerChain)
+ {
+ this.handlerChain = handlerChain;
+ }
+
+ public void writeTo(Writer writer) throws IOException
+ {
+ writer.write("<endpoint");
+ writer.write(" name='" + name + "'");
+ writer.write(" implementation='" + implementation + "'");
+ writer.write(" url-pattern='" + urlPattern + "'");
+ if (service != null)
+ writer.write(" service='" + service + "'");
+ if (port != null)
+ writer.write(" port='" + port + "'");
+ if (wsdl != null)
+ writer.write(" wsdl='" + wsdl + "'");
+ if (binding != null)
+ writer.write(" binding='" + binding + "'");
+ writer.write(" enable-mtom='" + enableMTOM + "'");
+ writer.write(">");
+
+ if (handlerChain != null)
+ handlerChain.writeTo(writer);
+
+ writer.write("</endpoint>");
+ }
+
+ public String toString()
+ {
+ StringBuilder str = new StringBuilder("Endpoint");
+ str.append("\n name=" + name);
+ str.append("\n implementation=" + implementation);
+ str.append("\n url-pattern=" + urlPattern);
+ if (service != null)
+ str.append("\n service=" + service);
+ if (port != null)
+ str.append("\n port=" + port);
+ if (wsdl != null)
+ str.append("\n wsdl=" + wsdl);
+ if (binding != null)
+ str.append("\n binding=" + binding);
+ str.append("\n enable-mtom=" + enableMTOM);
+ return str.toString();
+ }
+}
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,98 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata.sunjaxws;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.common.IOUtils;
-
-//$Id$
-
-/**
- * Metadata model for sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DDEndpoints
-{
- private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>();
- private File tmpFile;
-
- public List<DDEndpoint> getEndpoints()
- {
- return endpoints;
- }
-
- public void addEndpoint(DDEndpoint ep)
- {
- endpoints.add(ep);
- }
-
- public URL createFileURL()
- {
- destroyFileURL();
-
- try
- {
- File tmpDir = IOUtils.createTempDirectory();
- tmpFile = File.createTempFile("jbossws-sun-jaxws", ".xml", tmpDir);
- Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile));
- writeTo(writer);
- writer.close();
-
- return tmpFile.toURL();
- }
- catch (IOException ex)
- {
- throw new WSFDeploymentException(ex);
- }
- }
-
- public void destroyFileURL()
- {
- if (tmpFile != null)
- {
- tmpFile.delete();
- tmpFile = null;
- }
- }
-
- public void writeTo(Writer writer) throws IOException
- {
- writer.write("<endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'>");
- for (DDEndpoint ep : endpoints)
- {
- ep.writeTo(writer);
- }
- writer.write("</endpoints>");
- }
-
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,98 @@
+/*
+ * 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.wsf.stack.metro.metadata.sunjaxws;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.common.IOUtils;
+
+//$Id$
+
+/**
+ * Metadata model for sun-jaxws.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DDEndpoints
+{
+ private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>();
+ private File tmpFile;
+
+ public List<DDEndpoint> getEndpoints()
+ {
+ return endpoints;
+ }
+
+ public void addEndpoint(DDEndpoint ep)
+ {
+ endpoints.add(ep);
+ }
+
+ public URL createFileURL()
+ {
+ destroyFileURL();
+
+ try
+ {
+ File tmpDir = IOUtils.createTempDirectory();
+ tmpFile = File.createTempFile("jbossws-sun-jaxws", ".xml", tmpDir);
+ Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile));
+ writeTo(writer);
+ writer.close();
+
+ return tmpFile.toURL();
+ }
+ catch (IOException ex)
+ {
+ throw new WSFDeploymentException(ex);
+ }
+ }
+
+ public void destroyFileURL()
+ {
+ if (tmpFile != null)
+ {
+ tmpFile.delete();
+ tmpFile = null;
+ }
+ }
+
+ public void writeTo(Writer writer) throws IOException
+ {
+ writer.write("<endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'>");
+ for (DDEndpoint ep : endpoints)
+ {
+ ep.writeTo(writer);
+ }
+ writer.write("</endpoints>");
+ }
+
+}
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,63 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata.sunjaxws;
-
-import java.io.IOException;
-import java.io.Writer;
-
-//$Id$
-
-/**
- * Metadata model for sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DDHandler
-{
- private String handlerName;
- private String handlerClass;
-
- public DDHandler(String handlerName, String handlerClass)
- {
- this.handlerName = handlerName;
- this.handlerClass = handlerClass;
- }
-
- public String getHandlerName()
- {
- return handlerName;
- }
-
- public String getHandlerClass()
- {
- return handlerClass;
- }
-
- public void writeTo(Writer writer) throws IOException
- {
- writer.write("<handler>");
- writer.write("<handler-name>" + handlerName + "</handler-name>");
- writer.write("<handler-class>" + handlerClass + "</handler-class>");
- writer.write("</handler>");
- }
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,63 @@
+/*
+ * 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.wsf.stack.metro.metadata.sunjaxws;
+
+import java.io.IOException;
+import java.io.Writer;
+
+//$Id$
+
+/**
+ * Metadata model for sun-jaxws.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DDHandler
+{
+ private String handlerName;
+ private String handlerClass;
+
+ public DDHandler(String handlerName, String handlerClass)
+ {
+ this.handlerName = handlerName;
+ this.handlerClass = handlerClass;
+ }
+
+ public String getHandlerName()
+ {
+ return handlerName;
+ }
+
+ public String getHandlerClass()
+ {
+ return handlerClass;
+ }
+
+ public void writeTo(Writer writer) throws IOException
+ {
+ writer.write("<handler>");
+ writer.write("<handler-name>" + handlerName + "</handler-name>");
+ writer.write("<handler-class>" + handlerClass + "</handler-class>");
+ writer.write("</handler>");
+ }
+}
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,74 +0,0 @@
-/*
- * 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.wsf.stack.metro.metadata.sunjaxws;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
-//$Id$
-
-/**
- * Metadata model for sun-jaxws.xml
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class DDHandlerChain
-{
- // Name of the endpoint
- private String name;
-
- private List<DDHandler> handlers = new ArrayList<DDHandler>();
-
- public DDHandlerChain(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public List<DDHandler> getEndpoints()
- {
- return handlers;
- }
-
- public void addEndpoint(DDHandler handler)
- {
- handlers.add(handler);
- }
-
- public void writeTo(Writer writer) throws IOException
- {
- writer.write("<handler-chain>");
- writer.write("<handler-chain-name>" + name + "</handler-chain-name>");
- for (DDHandler handler : handlers)
- {
- handler.writeTo(writer);
- }
- writer.write("</handler-chain>");
- }
-}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,74 @@
+/*
+ * 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.wsf.stack.metro.metadata.sunjaxws;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+//$Id$
+
+/**
+ * Metadata model for sun-jaxws.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public class DDHandlerChain
+{
+ // Name of the endpoint
+ private String name;
+
+ private List<DDHandler> handlers = new ArrayList<DDHandler>();
+
+ public DDHandlerChain(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public List<DDHandler> getEndpoints()
+ {
+ return handlers;
+ }
+
+ public void addEndpoint(DDHandler handler)
+ {
+ handlers.add(handler);
+ }
+
+ public void writeTo(Writer writer) throws IOException
+ {
+ writer.write("<handler-chain>");
+ writer.write("<handler-chain-name>" + name + "</handler-chain-name>");
+ for (DDHandler handler : handlers)
+ {
+ handler.writeTo(writer);
+ }
+ writer.write("</handler-chain>");
+ }
+}
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools)
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,38 +0,0 @@
-/*
- * 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.wsf.stack.metro.tools;
-
-import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-/**
- * Creates a WSContractConsumer that delegates to the Metro.
- *
- * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
- * @version $Revision:2311 $
- */
-public class MetroConsumerFactoryImpl implements WSContractConsumerFactory
-{
- public WSContractConsumer createConsumer() {
- return new MetroConsumerImpl();
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,38 @@
+/*
+ * 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.wsf.stack.metro.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+/**
+ * Creates a WSContractConsumer that delegates to the Metro.
+ *
+ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @version $Revision:2311 $
+ */
+public class MetroConsumerFactoryImpl implements WSContractConsumerFactory
+{
+ public WSContractConsumer createConsumer() {
+ return new MetroConsumerImpl();
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,215 +0,0 @@
-/*
- * 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.wsf.stack.metro.tools;
-
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.List;
-import java.util.ArrayList;
-import java.net.URL;
-
-import com.sun.tools.ws.wscompile.WsimportTool;
-
-/**
- * WSContractConsumer that delegates to the Sun CompileTool.
- *
- * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
- * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a>
- * @version $Revision$
- */
-public class MetroConsumerImpl extends WSContractConsumer
-{
- private List<File> bindingFiles = null;
- private File catalog = null;
- private boolean extension;
- private boolean generateSource = false;
- private File outputDir = new File("output");
- private File sourceDir = null;
- private String targetPackage = null;
- private PrintStream messageStream = null;
- private String wsdlLocation = null;
- private List<String> additionalCompilerClassPath = new ArrayList<String>();
- private String target = "2.0";
-
- @Override
- public void setBindingFiles(List<File> bindingFiles) {
- this.bindingFiles = bindingFiles;
- }
-
- @Override
- public void setCatalog(File catalog) {
- this.catalog = catalog;
- }
-
- @Override
- public void setExtension(boolean extension)
- {
- this.extension = extension;
- }
-
- @Override
- public void setGenerateSource(boolean generateSource) {
- this.generateSource = generateSource;
- }
-
- @Override
- public void setMessageStream(PrintStream messageStream) {
- // TODO Auto-generated method stub
- this.messageStream = messageStream;
- }
-
- @Override
- public void setOutputDirectory(File directory) {
- // TODO Auto-generated method stub
- outputDir = directory;
- }
-
- @Override
- public void setSourceDirectory(File directory) {
- sourceDir = directory;
- }
-
- @Override
- public void setTargetPackage(String targetPackage) {
- this.targetPackage = targetPackage;
- }
-
- @Override
- public void setWsdlLocation(String wsdlLocation) {
- this.wsdlLocation = wsdlLocation;
- }
-
- public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
- this.additionalCompilerClassPath = additionalCompilerClassPath;
- }
-
- @Override
- public void setTarget(String target) {
- this.target = target;
- }
-
- @Override
- public void consume(URL wsdl) {
- List<String> args = new ArrayList<String>();
- if (bindingFiles != null) {
- for (File file : bindingFiles) {
- args.add("-b");
- args.add(file.getAbsolutePath());
-
- }
- }
-
- if (catalog != null) {
- args.add("-catalog");
- args.add(catalog.getAbsolutePath());
- }
-
- if (extension)
- {
- args.add("-extension");
- }
-
- if (generateSource) {
- args.add("-keep");
- if (sourceDir != null) {
- if (!sourceDir.exists() && !sourceDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
-
- args.add("-s");
- args.add(sourceDir.getAbsolutePath());
- }
- }
-
- if (targetPackage != null) {
- args.add("-p");
- args.add(targetPackage);
- }
-
- if (wsdlLocation != null) {
- args.add("-wsdllocation");
- args.add(wsdlLocation);
- }
-
- PrintStream stream = messageStream;
- if (stream != null) {
- args.add("-verbose");
- } else {
- stream = new NullPrintStream();
- }
-
- if (!outputDir.exists() && !outputDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + outputDir.getName());
-
- // Always add the output directory and the wsdl location
- args.add("-d");
- args.add(outputDir.getAbsolutePath());
-
- // Always set the target
- if(!target.equals("2.0"))
- throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0");
-
- args.add("-target");
- args.add(target);
-
- // finally the WSDL file
- args.add(wsdl.toString());
-
- // See WsimportTool#compileGeneratedClasses()
- if(!additionalCompilerClassPath.isEmpty())
- {
- StringBuffer javaCP = new StringBuffer();
- for(String s : additionalCompilerClassPath)
- {
- javaCP.append(s).append(File.pathSeparator);
- }
- System.setProperty("java.class.path", javaCP.toString());
- }
-
- try
- {
- // enforce woodstox
- if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
-
- WsimportTool compileTool = new WsimportTool(stream);
- boolean success = compileTool.run(args.toArray(new String[0]));
-
- if(!success) throw new IllegalStateException("WsImport invocation failed");
- }
- catch (Throwable t)
- {
- if (messageStream != null)
- {
- messageStream.println("Failed to invoke WsImport");
- t.printStackTrace(messageStream);
- }
- else
- {
- t.printStackTrace();
- }
- }
-
- }
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,215 @@
+/*
+ * 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.wsf.stack.metro.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.net.URL;
+
+import com.sun.tools.ws.wscompile.WsimportTool;
+
+/**
+ * WSContractConsumer that delegates to the Sun CompileTool.
+ *
+ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a>
+ * @version $Revision$
+ */
+public class MetroConsumerImpl extends WSContractConsumer
+{
+ private List<File> bindingFiles = null;
+ private File catalog = null;
+ private boolean extension;
+ private boolean generateSource = false;
+ private File outputDir = new File("output");
+ private File sourceDir = null;
+ private String targetPackage = null;
+ private PrintStream messageStream = null;
+ private String wsdlLocation = null;
+ private List<String> additionalCompilerClassPath = new ArrayList<String>();
+ private String target = "2.0";
+
+ @Override
+ public void setBindingFiles(List<File> bindingFiles) {
+ this.bindingFiles = bindingFiles;
+ }
+
+ @Override
+ public void setCatalog(File catalog) {
+ this.catalog = catalog;
+ }
+
+ @Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
+ public void setGenerateSource(boolean generateSource) {
+ this.generateSource = generateSource;
+ }
+
+ @Override
+ public void setMessageStream(PrintStream messageStream) {
+ // TODO Auto-generated method stub
+ this.messageStream = messageStream;
+ }
+
+ @Override
+ public void setOutputDirectory(File directory) {
+ // TODO Auto-generated method stub
+ outputDir = directory;
+ }
+
+ @Override
+ public void setSourceDirectory(File directory) {
+ sourceDir = directory;
+ }
+
+ @Override
+ public void setTargetPackage(String targetPackage) {
+ this.targetPackage = targetPackage;
+ }
+
+ @Override
+ public void setWsdlLocation(String wsdlLocation) {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
+ this.additionalCompilerClassPath = additionalCompilerClassPath;
+ }
+
+ @Override
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ @Override
+ public void consume(URL wsdl) {
+ List<String> args = new ArrayList<String>();
+ if (bindingFiles != null) {
+ for (File file : bindingFiles) {
+ args.add("-b");
+ args.add(file.getAbsolutePath());
+
+ }
+ }
+
+ if (catalog != null) {
+ args.add("-catalog");
+ args.add(catalog.getAbsolutePath());
+ }
+
+ if (extension)
+ {
+ args.add("-extension");
+ }
+
+ if (generateSource) {
+ args.add("-keep");
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+ }
+
+ if (targetPackage != null) {
+ args.add("-p");
+ args.add(targetPackage);
+ }
+
+ if (wsdlLocation != null) {
+ args.add("-wsdllocation");
+ args.add(wsdlLocation);
+ }
+
+ PrintStream stream = messageStream;
+ if (stream != null) {
+ args.add("-verbose");
+ } else {
+ stream = new NullPrintStream();
+ }
+
+ if (!outputDir.exists() && !outputDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+
+ // Always add the output directory and the wsdl location
+ args.add("-d");
+ args.add(outputDir.getAbsolutePath());
+
+ // Always set the target
+ if(!target.equals("2.0"))
+ throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0");
+
+ args.add("-target");
+ args.add(target);
+
+ // finally the WSDL file
+ args.add(wsdl.toString());
+
+ // See WsimportTool#compileGeneratedClasses()
+ if(!additionalCompilerClassPath.isEmpty())
+ {
+ StringBuffer javaCP = new StringBuffer();
+ for(String s : additionalCompilerClassPath)
+ {
+ javaCP.append(s).append(File.pathSeparator);
+ }
+ System.setProperty("java.class.path", javaCP.toString());
+ }
+
+ try
+ {
+ // enforce woodstox
+ if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
+
+ WsimportTool compileTool = new WsimportTool(stream);
+ boolean success = compileTool.run(args.toArray(new String[0]));
+
+ if(!success) throw new IllegalStateException("WsImport invocation failed");
+ }
+ catch (Throwable t)
+ {
+ if (messageStream != null)
+ {
+ messageStream.println("Failed to invoke WsImport");
+ t.printStackTrace(messageStream);
+ }
+ else
+ {
+ t.printStackTrace();
+ }
+ }
+
+ }
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,39 +0,0 @@
-/*
- * 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.wsf.stack.metro.tools;
-
-import org.jboss.wsf.spi.tools.WSContractProviderFactory;
-import org.jboss.wsf.spi.tools.WSContractProvider;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class MetroProviderFactoryImpl implements WSContractProviderFactory
-{
- public WSContractProvider createProvider(ClassLoader loader)
- {
- WSContractProvider metroProvider = new MetroProviderImpl();
- metroProvider.setClassLoader(loader);
- return metroProvider;
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderFactoryImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,39 @@
+/*
+ * 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.wsf.stack.metro.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProviderFactory;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class MetroProviderFactoryImpl implements WSContractProviderFactory
+{
+ public WSContractProvider createProvider(ClassLoader loader)
+ {
+ WSContractProvider metroProvider = new MetroProviderImpl();
+ metroProvider.setClassLoader(loader);
+ return metroProvider;
+ }
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,193 +0,0 @@
-/*
- * 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.wsf.stack.metro.tools;
-
-import org.jboss.wsf.spi.tools.WSContractProvider;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.List;
-import java.util.ArrayList;
-import java.net.URLClassLoader;
-import java.net.URL;
-
-import com.sun.tools.ws.wscompile.WsgenTool;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class MetroProviderImpl extends WSContractProvider
-{
-
- private ClassLoader loader;
- private boolean generateWsdl = false;
- private boolean generateSource = false;
- private File outputDir = new File("output");
- private File resourceDir = null;
- private File sourceDir = null;
- private PrintStream messageStream = new NullPrintStream();
-
- public MetroProviderImpl()
- {
- }
-
- public void setGenerateWsdl(boolean generateWsdl)
- {
- this.generateWsdl = generateWsdl;
- }
-
- public void setGenerateSource(boolean generateSource)
- {
- this.generateSource = generateSource;
- }
-
- public void setOutputDirectory(File directory)
- {
- this.outputDir = directory;
- }
-
- public void setResourceDirectory(File directory)
- {
- this.resourceDir = directory;
- }
-
- public void setSourceDirectory(File directory)
- {
- this.sourceDir = directory;
- }
-
- public void setClassLoader(ClassLoader loader)
- {
- this.loader = loader;
- }
-
- public void setMessageStream(PrintStream messageStream)
- {
- this.messageStream = messageStream;
- }
-
- public void provide(String endpointClass)
- {
- try
- {
- provide(loader.loadClass(endpointClass));
- }
- catch (ClassNotFoundException e)
- {
- throw new IllegalArgumentException("Class not found: " + endpointClass);
- }
- }
-
- public void provide(Class<?> endpointClass)
- {
- // Swap the context classloader
- // The '--classpath' switch might provide an URLClassLoader
- ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-
- if(loader!=null)
- Thread.currentThread().setContextClassLoader(loader);
-
- try
- {
- List<String> args = new ArrayList<String>();
-
- // Use the output directory as the default
- File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir;
- File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir;
-
- if (generateSource) {
- args.add("-keep");
- if (sourceDir != null) {
- if (!sourceDir.exists() && !sourceDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
-
- args.add("-s");
- args.add(sourceDir.getAbsolutePath());
- }
- }
-
- // -d <directory>
- if (!outputDir.exists() && !outputDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + outputDir.getName());
-
- args.add("-d");
- args.add(outputDir.getAbsolutePath());
-
- // -r <directory>
- if (resourceDir != null) {
- if (!resourceDir.exists() && !resourceDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + resourceDir.getName());
- args.add("-r");
- args.add(resourceDir.getAbsolutePath());
- }
-
- // -s <directory>
- if (sourceDir != null) {
- if (!sourceDir.exists() && !sourceDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
- args.add("-s");
- args.add(sourceDir.getAbsolutePath());
- }
-
- // -verbose
- PrintStream stream = messageStream;
- if (stream != null) {
- args.add("-verbose");
- } else {
- stream = new NullPrintStream();
- }
-
- // -wsdl[:protocol]
- if (generateWsdl) {
- args.add("-wsdl");
- }
-
- // --classpath
- if(loader instanceof URLClassLoader)
- {
- StringBuilder builder = new StringBuilder();
- URLClassLoader urlLoader = (URLClassLoader)loader;
- for(URL url : urlLoader.getURLs())
- {
- builder.append(url.toExternalForm());
- builder.append(File.pathSeparator);
- }
-
- args.add("-classpath");
- args.add(builder.toString());
- }
-
- // the SEI
- args.add(endpointClass.getCanonicalName());
-
- WsgenTool tool = new WsgenTool(messageStream);
- tool.run(args.toArray(new String[0]));
-
- }
- finally{
- Thread.currentThread().setContextClassLoader(oldLoader);
- }
- }
-
-
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,193 @@
+/*
+ * 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.wsf.stack.metro.tools;
+
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.net.URLClassLoader;
+import java.net.URL;
+
+import com.sun.tools.ws.wscompile.WsgenTool;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class MetroProviderImpl extends WSContractProvider
+{
+
+ private ClassLoader loader;
+ private boolean generateWsdl = false;
+ private boolean generateSource = false;
+ private File outputDir = new File("output");
+ private File resourceDir = null;
+ private File sourceDir = null;
+ private PrintStream messageStream = new NullPrintStream();
+
+ public MetroProviderImpl()
+ {
+ }
+
+ public void setGenerateWsdl(boolean generateWsdl)
+ {
+ this.generateWsdl = generateWsdl;
+ }
+
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+
+ public void setOutputDirectory(File directory)
+ {
+ this.outputDir = directory;
+ }
+
+ public void setResourceDirectory(File directory)
+ {
+ this.resourceDir = directory;
+ }
+
+ public void setSourceDirectory(File directory)
+ {
+ this.sourceDir = directory;
+ }
+
+ public void setClassLoader(ClassLoader loader)
+ {
+ this.loader = loader;
+ }
+
+ public void setMessageStream(PrintStream messageStream)
+ {
+ this.messageStream = messageStream;
+ }
+
+ public void provide(String endpointClass)
+ {
+ try
+ {
+ provide(loader.loadClass(endpointClass));
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalArgumentException("Class not found: " + endpointClass);
+ }
+ }
+
+ public void provide(Class<?> endpointClass)
+ {
+ // Swap the context classloader
+ // The '--classpath' switch might provide an URLClassLoader
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+
+ if(loader!=null)
+ Thread.currentThread().setContextClassLoader(loader);
+
+ try
+ {
+ List<String> args = new ArrayList<String>();
+
+ // Use the output directory as the default
+ File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir;
+ File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir;
+
+ if (generateSource) {
+ args.add("-keep");
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+ }
+
+ // -d <directory>
+ if (!outputDir.exists() && !outputDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+
+ args.add("-d");
+ args.add(outputDir.getAbsolutePath());
+
+ // -r <directory>
+ if (resourceDir != null) {
+ if (!resourceDir.exists() && !resourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + resourceDir.getName());
+ args.add("-r");
+ args.add(resourceDir.getAbsolutePath());
+ }
+
+ // -s <directory>
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+
+ // -verbose
+ PrintStream stream = messageStream;
+ if (stream != null) {
+ args.add("-verbose");
+ } else {
+ stream = new NullPrintStream();
+ }
+
+ // -wsdl[:protocol]
+ if (generateWsdl) {
+ args.add("-wsdl");
+ }
+
+ // --classpath
+ if(loader instanceof URLClassLoader)
+ {
+ StringBuilder builder = new StringBuilder();
+ URLClassLoader urlLoader = (URLClassLoader)loader;
+ for(URL url : urlLoader.getURLs())
+ {
+ builder.append(url.toExternalForm());
+ builder.append(File.pathSeparator);
+ }
+
+ args.add("-classpath");
+ args.add(builder.toString());
+ }
+
+ // the SEI
+ args.add(endpointClass.getCanonicalName());
+
+ WsgenTool tool = new WsgenTool(messageStream);
+ tool.run(args.toArray(new String[0]));
+
+ }
+ finally{
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
+ }
+
+
+}
Deleted: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,209 +0,0 @@
-/*
- * 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.wsf.stack.metro.tools;
-
-import java.io.PrintStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Locale;
-
-class NullPrintStream extends PrintStream
-{
- NullPrintStream()
- {
- // Doesn't actually do anything
- super(new ByteArrayOutputStream());
- }
-
- @Override
- public PrintStream append(char c)
- {
- return this;
- }
-
- @Override
- public PrintStream append(CharSequence csq, int start, int end)
- {
- return this;
- }
-
- @Override
- public PrintStream append(CharSequence csq)
- {
- return this;
- }
-
- @Override
- public boolean checkError()
- {
- return false;
- }
-
- @Override
- public void close()
- {
- }
-
- @Override
- public void flush()
- {
- }
-
- @Override
- public PrintStream format(Locale l, String format, Object... args)
- {
- return this;
- }
-
- @Override
- public PrintStream format(String format, Object... args)
- {
- return this;
- }
-
- @Override
- public void print(boolean b)
- {
- }
-
- @Override
- public void print(char c)
- {
- }
-
- @Override
- public void print(char[] s)
- {
- }
-
- @Override
- public void print(double d)
- {
- }
-
- @Override
- public void print(float f)
- {
- }
-
- @Override
- public void print(int i)
- {
- }
-
- @Override
- public void print(long l)
- {
- }
-
- @Override
- public void print(Object obj)
- {
- }
-
- @Override
- public void print(String s)
- {
- }
-
- @Override
- public PrintStream printf(Locale l, String format, Object... args)
- {
- return this;
- }
-
- @Override
- public PrintStream printf(String format, Object... args)
- {
- return this;
- }
-
- @Override
- public void println()
- {
- }
-
- @Override
- public void println(boolean x)
- {
- }
-
- @Override
- public void println(char x)
- {
- }
-
- @Override
- public void println(char[] x)
- {
- }
-
- @Override
- public void println(double x)
- {
- }
-
- @Override
- public void println(float x)
- {
- }
-
- @Override
- public void println(int x)
- {
- }
-
- @Override
- public void println(long x)
- {
- }
-
- @Override
- public void println(Object x)
- {
- }
-
- @Override
- public void println(String x)
- {
- }
-
- @Override
- protected void setError()
- {
- }
-
- @Override
- public void write(byte[] buf, int off, int len)
- {
- }
-
- @Override
- public void write(int b)
- {
- }
-
- @Override
- public void write(byte[] b) throws IOException
- {
- }
-}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,209 @@
+/*
+ * 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.wsf.stack.metro.tools;
+
+import java.io.PrintStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Locale;
+
+class NullPrintStream extends PrintStream
+{
+ NullPrintStream()
+ {
+ // Doesn't actually do anything
+ super(new ByteArrayOutputStream());
+ }
+
+ @Override
+ public PrintStream append(char c)
+ {
+ return this;
+ }
+
+ @Override
+ public PrintStream append(CharSequence csq, int start, int end)
+ {
+ return this;
+ }
+
+ @Override
+ public PrintStream append(CharSequence csq)
+ {
+ return this;
+ }
+
+ @Override
+ public boolean checkError()
+ {
+ return false;
+ }
+
+ @Override
+ public void close()
+ {
+ }
+
+ @Override
+ public void flush()
+ {
+ }
+
+ @Override
+ public PrintStream format(Locale l, String format, Object... args)
+ {
+ return this;
+ }
+
+ @Override
+ public PrintStream format(String format, Object... args)
+ {
+ return this;
+ }
+
+ @Override
+ public void print(boolean b)
+ {
+ }
+
+ @Override
+ public void print(char c)
+ {
+ }
+
+ @Override
+ public void print(char[] s)
+ {
+ }
+
+ @Override
+ public void print(double d)
+ {
+ }
+
+ @Override
+ public void print(float f)
+ {
+ }
+
+ @Override
+ public void print(int i)
+ {
+ }
+
+ @Override
+ public void print(long l)
+ {
+ }
+
+ @Override
+ public void print(Object obj)
+ {
+ }
+
+ @Override
+ public void print(String s)
+ {
+ }
+
+ @Override
+ public PrintStream printf(Locale l, String format, Object... args)
+ {
+ return this;
+ }
+
+ @Override
+ public PrintStream printf(String format, Object... args)
+ {
+ return this;
+ }
+
+ @Override
+ public void println()
+ {
+ }
+
+ @Override
+ public void println(boolean x)
+ {
+ }
+
+ @Override
+ public void println(char x)
+ {
+ }
+
+ @Override
+ public void println(char[] x)
+ {
+ }
+
+ @Override
+ public void println(double x)
+ {
+ }
+
+ @Override
+ public void println(float x)
+ {
+ }
+
+ @Override
+ public void println(int x)
+ {
+ }
+
+ @Override
+ public void println(long x)
+ {
+ }
+
+ @Override
+ public void println(Object x)
+ {
+ }
+
+ @Override
+ public void println(String x)
+ {
+ }
+
+ @Override
+ protected void setError()
+ {
+ }
+
+ @Override
+ public void write(byte[] buf, int off, int len)
+ {
+ }
+
+ @Override
+ public void write(int b)
+ {
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException
+ {
+ }
+}
Copied: stack/metro/trunk/modules/server/src/main/resources (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources)
Deleted: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,117 +0,0 @@
-
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
- element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
-
- If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
- If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
-
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
- -->
- <property name="webServiceHost">${jboss.bind.address}</property>
- <property name="modifySOAPAddress">true</property>
-
- <!--
- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
- If multiple connectors are found the port of the first connector is used.
- <property name="webServiceSecurePort">8443</property>
- <property name="webServicePort">8080</property>
- -->
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>javax.enterprise.resource.webservices.jaxws</value>
- <value>com.sun</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
- <!--
- The stack specific deployment aspects
- -->
- <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">StackDescriptor</property>
- </bean>
-
- <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
- <property name="requires">RuntimeLoader, StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
- </bean>
- <!-- Deployment aspect installers -->
-
- <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <!-- phase 2 -->
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerJSE</depends>
- </bean>
-
-
- <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <!-- phase 2 -->
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-config.xml)
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,117 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>javax.enterprise.resource.webservices.jaxws</value>
+ <value>com.sun</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">StackDescriptor</property>
+ </bean>
+
+ <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
+ <property name="requires">RuntimeLoader, StackDescriptor</property>
+ <property name="provides">RuntimeModel</property>
+ </bean>
+ <!-- Deployment aspect installers -->
+
+ <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ <!-- phase 2 -->
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
+ </bean>
+
+
+ <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ <!-- phase 2 -->
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar)
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF)
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services)
Deleted: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory)
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.metro.EndpointRegistryFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory)
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.metro.EndpointRegistryFactoryImpl
\ No newline at end of file
Deleted: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.metro.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory)
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.metro.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Copied: stack/metro/trunk/modules/server/src/main/scripts (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts)
Deleted: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main">
-
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
- </target>
-
- <!-- Compile resource files -->
- <target name="main" depends="init">
-
- <!-- Concat jbossws-jboss422/jbossws.beans -->
- <echo message="Concat jbossws-jboss422/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423/jbossws.beans -->
- <echo message="Concat jbossws-jboss423/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss500/jbossws.beans -->
- <echo message="Concat jbossws-jboss500/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- </target>
-
-</project>
Copied: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml)
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (rev 0)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main">
+
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+
+ <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="main" depends="init">
+
+ <!-- Concat jbossws-jboss422/jbossws.beans -->
+ <echo message="Concat jbossws-jboss422/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss423/jbossws.beans -->
+ <echo message="Concat jbossws-jboss423/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss500/jbossws.beans -->
+ <echo message="Concat jbossws-jboss500/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss501/jbossws.beans -->
+ <echo message="Concat jbossws-jboss501/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+</project>
Copied: stack/metro/trunk/modules/testsuite (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite)
Copied: stack/metro/trunk/modules/testsuite/framework-tests (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests)
Property changes on: stack/metro/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
+ src
target
Deleted: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,545 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Framework Tests</name>
- <artifactId>jbossws-metro-framework-tests</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro-testsuite</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/test</directory>
- <includes>
- <include>ant-import/**</include>
- <include>java/**</include>
- <include>resources/**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>src/test</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss422</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
- -->
- <testExcludes>
- <!-- [JBWS-2165] Fix xop tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
-
- <!-- [JBWS-2164] Fix tools tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
-
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
-
- <!-- [JBWS-1673] Fix JAXR samples for Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
-
- <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
- <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
-
- <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
- <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
-
- <!-- [JBWS-2129] Wrapper class is not found -->
- <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [JBWS-2013] Implement standard messge context properties -->
- <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
-
- <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
-
- <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
- <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
-
- <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
- <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
-
- <!-- [JBWS-2133] Failed to access the WSDL -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
-
- <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
- <!-- [JBWS-2135] WebServiceException: Undefined port type -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
-
- <!-- [JBWS-2029] Make the project generator available for all stacks -->
- <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
- -->
- <testExcludes>
- <!-- [JBWS-2165] Fix xop tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
-
- <!-- [JBWS-2164] Fix tools tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
-
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
-
- <!-- [JBWS-1673] Fix JAXR samples for Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
-
- <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
- <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
-
- <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
- <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
-
- <!-- [JBWS-2129] Wrapper class is not found -->
- <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [JBWS-2013] Implement standard messge context properties -->
- <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
-
- <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
-
- <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
- <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
-
- <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
- <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
-
- <!-- [JBWS-2133] Failed to access the WSDL -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
-
- <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
- <!-- [JBWS-2135] WebServiceException: Undefined port type -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
-
- <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
-
- <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
-
- <!-- [JBWS-2029] Make the project generator available for all stacks -->
- <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
- -->
- <testExcludes>
- <!-- [JBWS-2165] Fix xop tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
-
- <!-- [JBWS-2164] Fix tools tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
-
- <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1673] Fix JAXR samples for Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
- <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
-
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
-
- <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
- <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
-
- <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
- <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
-
- <!-- [JBWS-2129] Wrapper class is not found -->
- <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [JBWS-2013] Implement standard messge context properties -->
- <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
-
- <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
-
- <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
- <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
-
- <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
- <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
-
- <!-- [JBWS-2133] Failed to access the WSDL -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
-
- <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
- <!-- [JBWS-2135] WebServiceException: Undefined port type -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
-
- <!-- [JBWS-2137] @WebWservice does not work with class isolation -->
- <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
-
- <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
-
- <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
-
- <!-- [JBWS-2029] Make the project generator available for all stacks -->
- <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
- -->
- <testExcludes>
- <!-- [JBWS-2165] Fix xop tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
-
- <!-- [JBWS-2164] Fix tools tests with maven build -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
-
- <!-- [EJBTHREE-1150] WebServiceContext injection requires mapped-name -->
- <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude>
-
- <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
-
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1673] Fix JAXR samples for Metro -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- TODO: Fix classpath to ClientLauncher -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
-
- <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
- <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
-
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
-
- <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
- <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
-
- <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
- <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
-
- <!-- [JBWS-2129] Wrapper class is not found -->
- <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [JBWS-2013] Implement standard messge context properties -->
- <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
-
- <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
-
- <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
- <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
-
- <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
- <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
-
- <!-- [JBWS-2133] Failed to access the WSDL -->
- <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
-
- <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
- <!-- [JBWS-2135] WebServiceException: Undefined port type -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
-
- <!-- [JBAS-5359] mapped-name is required for context of deployment -->
- <exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude>
-
- <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory -->
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude>
-
- <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
-
- <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
-
- <!-- [JBWS-2029] Make the project generator available for all stacks -->
- <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Copied: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,545 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Framework Tests</name>
+ <artifactId>jbossws-metro-framework-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/test</directory>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/**</include>
+ <include>resources/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>src/test</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
+
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [JBWS-2129] Wrapper class is not found -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [JBWS-2013] Implement standard messge context properties -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
+
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [JBWS-2129] Wrapper class is not found -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [JBWS-2013] Implement standard messge context properties -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
+
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
+
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
+
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [JBWS-2129] Wrapper class is not found -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [JBWS-2013] Implement standard messge context properties -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBWS-2137] @WebWservice does not work with class isolation -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
+
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
+
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
+
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
+ -->
+ <testExcludes>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
+
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+
+ <!-- [EJBTHREE-1150] WebServiceContext injection requires mapped-name -->
+ <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude>
+
+ <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- TODO: Fix classpath to ClientLauncher -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+
+ <!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
+
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
+ <exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
+
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
+
+ <!-- [JBWS-2129] Wrapper class is not found -->
+ <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+
+ <!-- [JBWS-2013] Implement standard messge context properties -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
+
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
+
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
+
+ <!-- [JBAS-5359] mapped-name is required for context of deployment -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude>
+
+ <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory -->
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude>
+
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
+
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
+
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests)
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,160 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Specific Tests</name>
- <artifactId>jbossws-metro-specific-tests</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro-testsuite</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <ant antfile="src/scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="src/scripts/metro-samples-jaxws.xml" target="build-samples-jaxws"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss422</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
-
- <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
-
- <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
-
- <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <activation>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
-
- <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
-
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,160 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Specific Tests</name>
+ <artifactId>jbossws-metro-specific-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <ant antfile="src/scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="src/scripts/metro-samples-jaxws.xml" target="build-samples-jaxws"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <activation>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <description>JBossWS test archive builder</description>
-
- <!-- ============================================================================== -->
- <!-- Building -->
- <!-- -->
- <!-- Where to create your tests -->
- <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
-
- <target name="build-jars-jaxws" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/test-libs"/>
-
- <!-- jbws1869 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/>
- </classes>
- </war>
-
- <!-- jbws1871 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/>
- </classes>
- </war>
-
- <!-- wsit-rm -->
- <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/>
- <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/>
- <include name="org/jboss/test/ws/wsit/rm/Add.class"/>
- <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF">
- <include name="sun-web.xml"/>
- <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
- </webinf>
- </war>
-
- </target>
-
-</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ============================================================================== -->
+ <!-- Building -->
+ <!-- -->
+ <!-- Where to create your tests -->
+ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
+ <!-- -->
+ <!-- ============================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jbws1869 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/>
+ </classes>
+ </war>
+
+ <!-- jbws1871 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/>
+ </classes>
+ </war>
+
+ <!-- wsit-rm -->
+ <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/Add.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF">
+ <include name="sun-web.xml"/>
+ <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
+ </webinf>
+ </war>
+
+ </target>
+
+</project>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
-
- <mkdir dir="${tests.output.dir}/test-libs"/>
-
- <!-- jaxws-samples-wsa -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
- </classes>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
- <!-- jaxws-samples-wsrm -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
- <include name="wsit-*.xml"/>
- </webinf>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
- <!-- jaxws-samples-wsse-sign -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
- <include name="wsit-*.xml"/>
- </webinf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
- <include name="server-*.jks"/>
- <include name="services/**"/>
- </metainf>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
- <include name="client-*.jks"/>
- <include name="wsit-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-sign-encrypt -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
- <include name="wsit-*.xml"/>
- </webinf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
- <include name="server-*.jks"/>
- <include name="services/**"/>
- </metainf>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
- <include name="client-*.jks"/>
- <include name="wsit-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-wsse-username -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
- <include name="wsit-*.xml"/>
- </webinf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
- <include name="services/**"/>
- </metainf>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
- <include name="wsit-client.xml"/>
- </metainf>
- </jar>
-
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="client-*.jks"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-sign-encrypt -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="client-*.jks"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-username -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <!--appender-ref ref="CONSOLE"/-->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}/test.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,4 +0,0 @@
-grant {
- permission java.security.AllPermission;
-};
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869 (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
-
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Properties;
-
-/**
- * Reads a SOAP message from HTTP body and invokes an
- * Endpoint through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleRequest(org.jboss.wsf.spi.deployment.Endpoint, java.io.InputStream, java.io.OutputStream, org.jboss.wsf.spi.invocation.InvocationContext)}
- */
-public class DelegationServlet extends HttpServlet
-{
-
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
- {
- ObjectName EP_NAME = null;
- try
- {
- EP_NAME = new ObjectName("jboss.ws:context=jaxws-jbws1869,endpoint=Endpoint");
- }
- catch (MalformedObjectNameException e) {}
-
- // EndpointRegistry access
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- EndpointRegistryFactory registryFactory = spiProvider.getSPI(EndpointRegistryFactory.class);
- EndpointRegistry reg = registryFactory.getEndpointRegistry();
-
- Endpoint endpoint = reg.getEndpoint(EP_NAME);
- ServletInputStream inputStream = request.getInputStream();
- OutputStream outputStream = response.getOutputStream();
-
- try
- {
- InvocationContext invocationContext = new InvocationContext();
- Properties props = new Properties();
- props.put("Content-Type", request.getContentType());
- invocationContext.addAttachment(Properties.class, props);
-
- endpoint.getRequestHandler().handleRequest(endpoint, inputStream, outputStream, invocationContext);
- }
- catch(Exception e)
- {
- throw new ServletException("Failed to invoke endpoint", e);
- }
- finally
- {
- if(inputStream!=null) inputStream.close();
- if(outputStream!=null) outputStream.close();
- }
-
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/DelegationServlet.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Properties;
+
+/**
+ * Reads a SOAP message from HTTP body and invokes an
+ * Endpoint through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleRequest(org.jboss.wsf.spi.deployment.Endpoint, java.io.InputStream, java.io.OutputStream, org.jboss.wsf.spi.invocation.InvocationContext)}
+ */
+public class DelegationServlet extends HttpServlet
+{
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ ObjectName EP_NAME = null;
+ try
+ {
+ EP_NAME = new ObjectName("jboss.ws:context=jaxws-jbws1869,endpoint=Endpoint");
+ }
+ catch (MalformedObjectNameException e) {}
+
+ // EndpointRegistry access
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistryFactory registryFactory = spiProvider.getSPI(EndpointRegistryFactory.class);
+ EndpointRegistry reg = registryFactory.getEndpointRegistry();
+
+ Endpoint endpoint = reg.getEndpoint(EP_NAME);
+ ServletInputStream inputStream = request.getInputStream();
+ OutputStream outputStream = response.getOutputStream();
+
+ try
+ {
+ InvocationContext invocationContext = new InvocationContext();
+ Properties props = new Properties();
+ props.put("Content-Type", request.getContentType());
+ invocationContext.addAttachment(Properties.class, props);
+
+ endpoint.getRequestHandler().handleRequest(endpoint, inputStream, outputStream, invocationContext);
+ }
+ catch(Exception e)
+ {
+ throw new ServletException("Failed to invoke endpoint", e);
+ }
+ finally
+ {
+ if(inputStream!=null) inputStream.close();
+ if(outputStream!=null) outputStream.close();
+ }
+
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
-
-import javax.jws.WebService;
-
-@WebService
-public interface JBWS1869Endpoint
-{
- public String echo(String msg);
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869Endpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
+
+import javax.jws.WebService;
+
+@WebService
+public interface JBWS1869Endpoint
+{
+ public String echo(String msg);
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
-
-import javax.jws.WebService;
-
-@WebService
-public class JBWS1869EndpointImpl implements JBWS1869Endpoint
-{
-
- public String echo(String msg)
- {
- System.out.println(msg);
- return msg;
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869EndpointImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
+
+import javax.jws.WebService;
+
+@WebService
+public class JBWS1869EndpointImpl implements JBWS1869Endpoint
+{
+
+ public String echo(String msg)
+ {
+ System.out.println(msg);
+ return msg;
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
-
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.OutputStreamWriter;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-/**
- * Support stream based RequestHandler API
- */
-public class JBWS1869TestCase extends JBossWSTest
-{
- private final static String TNS = "http://jbws1869.jaxws.ws.test.jboss.org/";
- private final static QName portName = new QName(TNS, "JBWS1869EndpointImplPort");
- private final static QName serviceName = new QName(TNS, "JBWS1869EndpointImplService");
-
- private final static String REQUEST = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:echo xmlns:ns2=\"http://jbws1869.jaxws.ws.test.jboss.org/\"><arg0>StreamBasedInvocation</arg0></ns2:echo></S:Body></S:Envelope>";
- private final static String RESPONSE = "<S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:echoResponse xmlns:ns2=\"http://jbws1869.jaxws.ws.test.jboss.org/\"><return>StreamBasedInvocation</return></ns2:echoResponse></S:Body></S:Envelope>";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1869TestCase.class, "jaxws-jbws1869.war");
- }
-
- /**
- * Go through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleHttpRequest(org.jboss.wsf.spi.deployment.Endpoint, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)}
- * @throws Exception
- */
- public void testServletInvocation() throws Exception
- {
- Service service = Service.create(
- new URL("http://"+getServerHost()+":8080/jaxws-jbws1869?wsdl"), serviceName
- );
- JBWS1869Endpoint port = service.getPort(portName, JBWS1869Endpoint .class);
-
- String res = port.echo("ServletInvocation");
- assertEquals(res, "ServletInvocation");
- }
-
- /**
- * Go through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleRequest(org.jboss.wsf.spi.deployment.Endpoint, java.io.InputStream, java.io.OutputStream, org.jboss.wsf.spi.invocation.InvocationContext)}
- * @throws Exception
- */
- public void testStreamBasedInvocation() throws Exception
- {
- // Send data
- URL url = new URL("http://"+getServerHost()+":8080/jaxws-jbws1869/delegate");
- HttpURLConnection conn = (HttpURLConnection)url.openConnection();
- conn.setDoOutput(true);
- conn.setRequestProperty("Content-Type", "text/xml");
-
-
- OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
- wr.write(REQUEST);
- wr.flush();
-
- // Get the response
- StringBuffer sb = new StringBuffer();
- BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String line;
- while ((line = rd.readLine()) != null)
- {
- sb.append(line);
- }
- wr.close();
- rd.close();
-
- // response assertion
- assertTrue(sb.toString().indexOf(RESPONSE) != -1);
- System.out.println("FIXME [JBWS-1869] Investigate why encoding appears in processing instruction in AS 5.0.x and not in AS 4.2.x response");
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.OutputStreamWriter;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+/**
+ * Support stream based RequestHandler API
+ */
+public class JBWS1869TestCase extends JBossWSTest
+{
+ private final static String TNS = "http://jbws1869.jaxws.ws.test.jboss.org/";
+ private final static QName portName = new QName(TNS, "JBWS1869EndpointImplPort");
+ private final static QName serviceName = new QName(TNS, "JBWS1869EndpointImplService");
+
+ private final static String REQUEST = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:echo xmlns:ns2=\"http://jbws1869.jaxws.ws.test.jboss.org/\"><arg0>StreamBasedInvocation</arg0></ns2:echo></S:Body></S:Envelope>";
+ private final static String RESPONSE = "<S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:echoResponse xmlns:ns2=\"http://jbws1869.jaxws.ws.test.jboss.org/\"><return>StreamBasedInvocation</return></ns2:echoResponse></S:Body></S:Envelope>";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1869TestCase.class, "jaxws-jbws1869.war");
+ }
+
+ /**
+ * Go through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleHttpRequest(org.jboss.wsf.spi.deployment.Endpoint, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)}
+ * @throws Exception
+ */
+ public void testServletInvocation() throws Exception
+ {
+ Service service = Service.create(
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws1869?wsdl"), serviceName
+ );
+ JBWS1869Endpoint port = service.getPort(portName, JBWS1869Endpoint .class);
+
+ String res = port.echo("ServletInvocation");
+ assertEquals(res, "ServletInvocation");
+ }
+
+ /**
+ * Go through {@link org.jboss.wsf.spi.invocation.RequestHandler#handleRequest(org.jboss.wsf.spi.deployment.Endpoint, java.io.InputStream, java.io.OutputStream, org.jboss.wsf.spi.invocation.InvocationContext)}
+ * @throws Exception
+ */
+ public void testStreamBasedInvocation() throws Exception
+ {
+ // Send data
+ URL url = new URL("http://"+getServerHost()+":8080/jaxws-jbws1869/delegate");
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+ conn.setDoOutput(true);
+ conn.setRequestProperty("Content-Type", "text/xml");
+
+
+ OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+ wr.write(REQUEST);
+ wr.flush();
+
+ // Get the response
+ StringBuffer sb = new StringBuffer();
+ BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ String line;
+ while ((line = rd.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ wr.close();
+ rd.close();
+
+ // response assertion
+ assertTrue(sb.toString().indexOf(RESPONSE) != -1);
+ System.out.println("FIXME [JBWS-1869] Investigate why encoding appears in processing instruction in AS 5.0.x and not in AS 4.2.x response");
+ }
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869.jaxws;
-
-import javax.xml.bind.annotation.*;
-
-@XmlRootElement(name = "echo", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echo", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
-public class Echo
-{
-
- @XmlElement(name = "arg0", namespace = "")
- private String arg0;
-
- /**
- *
- * @return
- * returns String
- */
- public String getArg0() {
- return this.arg0;
- }
-
- /**
- *
- * @param arg0
- * the value for the arg0 property
- */
- public void setArg0(String arg0) {
- this.arg0 = arg0;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869.jaxws;
+
+import javax.xml.bind.annotation.*;
+
+@XmlRootElement(name = "echo", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
+public class Echo
+{
+
+ @XmlElement(name = "arg0", namespace = "")
+ private String arg0;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getArg0() {
+ return this.arg0;
+ }
+
+ /**
+ *
+ * @param arg0
+ * the value for the arg0 property
+ */
+ public void setArg0(String arg0) {
+ this.arg0 = arg0;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1869.jaxws;
-
-import javax.xml.bind.annotation.*;
-
-@XmlRootElement(name = "echoResponse", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoResponse", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
-public class EchoResponse
-{
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- /**
- *
- * @return
- * returns String
- */
- public String getReturn() {
- return this._return;
- }
-
- /**
- *
- * @param _return
- * the value for the _return property
- */
- public void setReturn(String _return) {
- this._return = _return;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1869.jaxws;
+
+import javax.xml.bind.annotation.*;
+
+@XmlRootElement(name = "echoResponse", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", namespace = "http://jbws1869.jaxws.ws.test.jboss.org/")
+public class EchoResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871 (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
-
-import org.jboss.wsf.test.GenericSOAPHandler;
-
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * Intentionally creates an Exception.
- * Causes client side to fail
- */
-public class CausesAnExceptionHandler extends GenericSOAPHandler
-{
- protected boolean handleOutbound(MessageContext messageContext)
- {
- throw new RuntimeException("Intentionally created Exception");
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
+
+import org.jboss.wsf.test.GenericSOAPHandler;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Intentionally creates an Exception.
+ * Causes client side to fail
+ */
+public class CausesAnExceptionHandler extends GenericSOAPHandler
+{
+ protected boolean handleOutbound(MessageContext messageContext)
+ {
+ throw new RuntimeException("Intentionally created Exception");
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.jws.HandlerChain;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-
-@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl")
-@HandlerChain(file = "jaxws-handler.xml")
-public class HandlerChainService extends Service
-{
-
- private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION;
- private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName());
-
- static {
- URL url = null;
- try {
- URL baseUrl;
- baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource(".");
- url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl");
- } catch (MalformedURLException e) {
- logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file");
- logger.warning(e.getMessage());
- }
- JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url;
- }
-
- public HandlerChainService(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public HandlerChainService() {
- super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService"));
- }
-
- /**
- *
- * @return
- * returns JBWS1871EndpointImpl
- */
- @WebEndpoint(name = "JBWS1871EndpointImplPort")
- public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() {
- return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class);
- }
-
-}
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.jws.HandlerChain;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+
+@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl")
+@HandlerChain(file = "jaxws-handler.xml")
+public class HandlerChainService extends Service
+{
+
+ private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION;
+ private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName());
+
+ static {
+ URL url = null;
+ try {
+ URL baseUrl;
+ baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource(".");
+ url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl");
+ } catch (MalformedURLException e) {
+ logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file");
+ logger.warning(e.getMessage());
+ }
+ JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url;
+ }
+
+ public HandlerChainService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public HandlerChainService() {
+ super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns JBWS1871EndpointImpl
+ */
+ @WebEndpoint(name = "JBWS1871EndpointImplPort")
+ public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() {
+ return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class);
+ }
+
+}
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
-
-import javax.jws.WebService;
-
-@WebService
-public interface JBWS1871Endpoint
-{
- public String echo(String msg);
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
+
+import javax.jws.WebService;
+
+@WebService
+public interface JBWS1871Endpoint
+{
+ public String echo(String msg);
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
-
-import javax.jws.WebService;
-
-
-@WebService
-public class JBWS1871EndpointImpl implements JBWS1871Endpoint
-{
-
- public String echo(String msg)
- {
- return msg;
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
+
+import javax.jws.WebService;
+
+
+@WebService
+public class JBWS1871EndpointImpl implements JBWS1871Endpoint
+{
+
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,58 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1871;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.0
- *
- */
-@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl")
-public class JBWS1871EndpointImplService
- extends Service
-{
-
- private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION;
- private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName());
-
- static {
- URL url = null;
- try {
- URL baseUrl;
- baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource(".");
- url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl");
- } catch (MalformedURLException e) {
- logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file");
- logger.warning(e.getMessage());
- }
- JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url;
- }
-
- public JBWS1871EndpointImplService(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public JBWS1871EndpointImplService() {
- super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService"));
- }
-
- /**
- *
- * @return
- * returns JBWS1871EndpointImpl
- */
- @WebEndpoint(name = "JBWS1871EndpointImplPort")
- public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() {
- return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class);
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,58 @@
+
+package org.jboss.test.ws.jaxws.jbws1871;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.3-b02-
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl")
+public class JBWS1871EndpointImplService
+ extends Service
+{
+
+ private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION;
+ private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName());
+
+ static {
+ URL url = null;
+ try {
+ URL baseUrl;
+ baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource(".");
+ url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl");
+ } catch (MalformedURLException e) {
+ logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file");
+ logger.warning(e.getMessage());
+ }
+ JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url;
+ }
+
+ public JBWS1871EndpointImplService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public JBWS1871EndpointImplService() {
+ super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns JBWS1871EndpointImpl
+ */
+ @WebEndpoint(name = "JBWS1871EndpointImplPort")
+ public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() {
+ return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class);
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-import junit.framework.Test;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-import java.net.URL;
-
-/**
- * Conformance (Handler resolver for a HandlerChain annotation): For a generated service class (see 2.7)
- * which is annotated with a HandlerChain annotation, the default handler resolver MUST return handler
- * chains consistent with the contents of the handler chain descriptor referenced by the HandlerChain annotation.
- */
-public class JBWS1871TestCase extends JBossWSTest
-{
- private final static String TNS = "http://jbws1871.jaxws.ws.test.jboss.org/";
- private final static QName portName = new QName(TNS, "JBWS1871EndpointImplPort");
- private final static QName serviceName = new QName(TNS, "JBWS1871EndpointImplService");
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1871TestCase.class, "jaxws-jbws1871.war");
- }
-
- public void testServiceWithoutHandlerChain() throws Exception
- {
- Service service = new JBWS1871EndpointImplService(
- new URL("http://"+getServerHost()+":8080/jaxws-jbws1871?wsdl"), serviceName
- );
- JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class);
-
- String res = port.echo("testServiceWithoutHandlerChain");
- assertEquals(res, "testServiceWithoutHandlerChain");
- }
-
- public void testServiceWithHandlerChain() throws Exception
- {
- Service service = new HandlerChainService(
- new URL("http://"+getServerHost()+":8080/jaxws-jbws1871?wsdl"), serviceName
- );
- JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class);
-
- try
- {
- String res = port.echo("testServiceWithHandlerChain");
- fail("CausesAnExceptionHandler.class on HandlerChainService.class should throw an Exception upon invocation");
- } catch (WebServiceException e)
- {
- assertEquals("java.lang.RuntimeException: Intentionally created Exception", e.getMessage());
- }
-
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws1871;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import junit.framework.Test;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+import java.net.URL;
+
+/**
+ * Conformance (Handler resolver for a HandlerChain annotation): For a generated service class (see 2.7)
+ * which is annotated with a HandlerChain annotation, the default handler resolver MUST return handler
+ * chains consistent with the contents of the handler chain descriptor referenced by the HandlerChain annotation.
+ */
+public class JBWS1871TestCase extends JBossWSTest
+{
+ private final static String TNS = "http://jbws1871.jaxws.ws.test.jboss.org/";
+ private final static QName portName = new QName(TNS, "JBWS1871EndpointImplPort");
+ private final static QName serviceName = new QName(TNS, "JBWS1871EndpointImplService");
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1871TestCase.class, "jaxws-jbws1871.war");
+ }
+
+ public void testServiceWithoutHandlerChain() throws Exception
+ {
+ Service service = new JBWS1871EndpointImplService(
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws1871?wsdl"), serviceName
+ );
+ JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class);
+
+ String res = port.echo("testServiceWithoutHandlerChain");
+ assertEquals(res, "testServiceWithoutHandlerChain");
+ }
+
+ public void testServiceWithHandlerChain() throws Exception
+ {
+ Service service = new HandlerChainService(
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws1871?wsdl"), serviceName
+ );
+ JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class);
+
+ try
+ {
+ String res = port.echo("testServiceWithHandlerChain");
+ fail("CausesAnExceptionHandler.class on HandlerChainService.class should throw an Exception upon invocation");
+ } catch (WebServiceException e)
+ {
+ assertEquals("java.lang.RuntimeException: Intentionally created Exception", e.getMessage());
+ }
+
+ }
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1871.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
-public class Echo {
-
- @XmlElement(name = "arg0", namespace = "")
- private String arg0;
-
- /**
- *
- * @return
- * returns String
- */
- public String getArg0() {
- return this.arg0;
- }
-
- /**
- *
- * @param arg0
- * the value for the arg0 property
- */
- public void setArg0(String arg0) {
- this.arg0 = arg0;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.jbws1871.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
+public class Echo {
+
+ @XmlElement(name = "arg0", namespace = "")
+ private String arg0;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getArg0() {
+ return this.arg0;
+ }
+
+ /**
+ *
+ * @param arg0
+ * the value for the arg0 property
+ */
+ public void setArg0(String arg0) {
+ this.arg0 = arg0;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1871.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
-public class EchoResponse {
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- /**
- *
- * @return
- * returns String
- */
- public String getReturn() {
- return this._return;
- }
-
- /**
- *
- * @param _return
- * the value for the _return property
- */
- public void setReturn(String _return) {
- this._return = _return;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.jbws1871.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/")
+public class EchoResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
- <handler-chain>
- <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
- <handler>
- <handler-name>SOAPMessageTrace</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws1871.CausesAnExceptionHandler</handler-class>
- </handler>
- </handler-chain>
-
-</handler-chains>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>SOAPMessageTrace</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws1871.CausesAnExceptionHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,55 +0,0 @@
-/*
- * 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.wsa;
-
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Client invoking web service using WS-Addressing
- *
- * @author richard.opalka(a)jboss.com
- */
-public final class AddressingTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
- }
-
- public void test() throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
-
- assertEquals("Hello World!", proxy.sayHello());
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,55 @@
+/*
+ * 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.wsa;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Client invoking web service using WS-Addressing
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class AddressingTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+
+ assertEquals("Hello World!", proxy.sayHello());
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,35 +0,0 @@
-/*
- * 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.wsa;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-(
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing"
-)
-public interface ServiceIface
-{
- @WebMethod
- String sayHello();
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,35 @@
+/*
+ * 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.wsa;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,40 +0,0 @@
-/*
- * 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.wsa;
-
-import javax.jws.WebService;
-
-@WebService
-(
- portName = "AddressingServicePort",
- serviceName = "AddressingService",
- wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl",
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface"
-)
-public class ServiceImpl implements ServiceIface
-{
- public String sayHello()
- {
- return "Hello World!";
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,40 @@
+/*
+ * 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.wsa;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "AddressingServicePort",
+ serviceName = "AddressingService",
+ wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Hello World!";
+ }
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsa.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
-public class SayHello {
-
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.wsa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+public class SayHello {
+
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsa.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
-public class SayHelloResponse {
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- /**
- *
- * @return
- * returns String
- */
- public String getReturn() {
- return this._return;
- }
-
- /**
- *
- * @param _return
- * the value for the _return property
- */
- public void setReturn(String _return) {
- this._return = _return;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+public class SayHelloResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,70 +0,0 @@
-/*
- * 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.wsrm.client;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
-
-import com.sun.xml.ws.Closeable;
-
-/**
- * Client invoking web service using WS-RM
- *
- * @author richard.opalka(a)jboss.com
- */
-public final class SimpleServiceTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
- private SimpleService proxy;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war");
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- proxy = (SimpleService)service.getPort(SimpleService.class);
- }
-
- public void test() throws Exception
- {
- proxy.ping(); // one way call
- assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
- ((Closeable)proxy).close();
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,70 @@
+/*
+ * 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.wsrm.client;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+
+import com.sun.xml.ws.Closeable;
+
+/**
+ * Client invoking web service using WS-RM
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class SimpleServiceTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
+ private SimpleService proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (SimpleService)service.getPort(SimpleService.class);
+ }
+
+ public void test() throws Exception
+ {
+ proxy.ping(); // one way call
+ assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
+ ((Closeable)proxy).close();
+ }
+
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,60 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echo", propOrder = {
- "arg0"
-})
-public class Echo {
-
- protected String arg0;
-
- /**
- * Gets the value of the arg0 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArg0() {
- return arg0;
- }
-
- /**
- * Sets the value of the arg0 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArg0(String value) {
- this.arg0 = value;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,60 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echo">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", propOrder = {
+ "arg0"
+})
+public class Echo {
+
+ protected String arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setArg0(String value) {
+ this.arg0 = value;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,62 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoResponse", propOrder = {
- "_return"
-})
-public class EchoResponse {
-
- @XmlElement(name = "return")
- protected String _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setReturn(String value) {
- this._return = value;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,62 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echoResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", propOrder = {
+ "_return"
+})
+public class EchoResponse {
+
+ @XmlElement(name = "return")
+ protected String _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReturn(String value) {
+ this._return = value;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,89 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse");
- private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo");
- private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link Ping }
- *
- */
- public Ping createPing() {
- return new Ping();
- }
-
- /**
- * Create an instance of {@link EchoResponse }
- *
- */
- public EchoResponse createEchoResponse() {
- return new EchoResponse();
- }
-
- /**
- * Create an instance of {@link Echo }
- *
- */
- public Echo createEcho() {
- return new Echo();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse")
- public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) {
- return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo")
- public JAXBElement<Echo> createEcho(Echo value) {
- return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping")
- public JAXBElement<Ping> createPing(Ping value) {
- return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value);
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,89 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse");
+ private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo");
+ private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link Ping }
+ *
+ */
+ public Ping createPing() {
+ return new Ping();
+ }
+
+ /**
+ * Create an instance of {@link EchoResponse }
+ *
+ */
+ public EchoResponse createEchoResponse() {
+ return new EchoResponse();
+ }
+
+ /**
+ * Create an instance of {@link Echo }
+ *
+ */
+ public Echo createEcho() {
+ return new Echo();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse")
+ public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) {
+ return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo")
+ public JAXBElement<Echo> createEcho(Echo value) {
+ return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping")
+ public JAXBElement<Ping> createPing(Ping value) {
+ return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value);
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,32 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ping complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="ping">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ping")
-public class Ping {
-
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,32 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ping complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ping">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping")
+public class Ping {
+
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,45 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.0
- *
- */
-@WebService(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-public interface SimpleService {
-
-
- /**
- *
- */
- @WebMethod
- @Oneway
- @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping")
- public void ping();
-
- /**
- *
- * @param arg0
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo")
- @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse")
- public String echo(
- @WebParam(name = "arg0", targetNamespace = "")
- String arg0);
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,45 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.3-b02-
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+public interface SimpleService {
+
+
+ /**
+ *
+ */
+ @WebMethod
+ @Oneway
+ @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping")
+ public void ping();
+
+ /**
+ *
+ * @param arg0
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(targetNamespace = "")
+ @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo")
+ @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse")
+ public String echo(
+ @WebParam(name = "arg0", targetNamespace = "")
+ String arg0);
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,58 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.3-b02-
- * Generated source version: 2.0
- *
- */
-@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl")
-public class SimpleService_Service
- extends Service
-{
-
- private final static URL SIMPLESERVICE_WSDL_LOCATION;
- private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService_Service.class.getName());
-
- static {
- URL url = null;
- try {
- URL baseUrl;
- baseUrl = org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService_Service.class.getResource(".");
- url = new URL(baseUrl, "file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl");
- } catch (MalformedURLException e) {
- logger.warning("Failed to create URL for the wsdl Location: 'file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl', retrying as a local file");
- logger.warning(e.getMessage());
- }
- SIMPLESERVICE_WSDL_LOCATION = url;
- }
-
- public SimpleService_Service(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public SimpleService_Service() {
- super(SIMPLESERVICE_WSDL_LOCATION, new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"));
- }
-
- /**
- *
- * @return
- * returns SimpleService
- */
- @WebEndpoint(name = "SimpleServicePort")
- public SimpleService getSimpleServicePort() {
- return super.getPort(new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort"), SimpleService.class);
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,58 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.3-b02-
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl")
+public class SimpleService_Service
+ extends Service
+{
+
+ private final static URL SIMPLESERVICE_WSDL_LOCATION;
+ private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService_Service.class.getName());
+
+ static {
+ URL url = null;
+ try {
+ URL baseUrl;
+ baseUrl = org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService_Service.class.getResource(".");
+ url = new URL(baseUrl, "file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl");
+ } catch (MalformedURLException e) {
+ logger.warning("Failed to create URL for the wsdl Location: 'file:/home/opalka/TODO/TUTORIAL/step1/wsprovide/generated/wsdl/SimpleService.wsdl', retrying as a local file");
+ logger.warning(e.getMessage());
+ }
+ SIMPLESERVICE_WSDL_LOCATION = url;
+ }
+
+ public SimpleService_Service(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SimpleService_Service() {
+ super(SIMPLESERVICE_WSDL_LOCATION, new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns SimpleService
+ */
+ @WebEndpoint(name = "SimpleServicePort")
+ public SimpleService getSimpleServicePort() {
+ return super.getPort(new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort"), SimpleService.class);
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,2 +0,0 @@
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-package org.jboss.test.ws.jaxws.samples.wsrm.generated;
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,50 +0,0 @@
-/*
- * 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.wsrm.service;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-(
- name = "SimpleService",
- serviceName = "SimpleService",
- wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl",
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
-)
-public class SimpleServiceImpl
-{
- @Oneway
- @WebMethod
- public void ping()
- {
- System.out.println("ping()");
- }
-
- @WebMethod
- public String echo(String s)
- {
- System.out.println("echo(" + s + ")");
- return s;
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,50 @@
+/*
+ * 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.wsrm.service;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ name = "SimpleService",
+ serviceName = "SimpleService",
+ wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
+public class SimpleServiceImpl
+{
+ @Oneway
+ @WebMethod
+ public void ping()
+ {
+ System.out.println("ping()");
+ }
+
+ @WebMethod
+ public String echo(String s)
+ {
+ System.out.println("echo(" + s + ")");
+ return s;
+ }
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-public class Echo {
-
- @XmlElement(name = "arg0", namespace = "")
- private String arg0;
-
- /**
- *
- * @return
- * returns String
- */
- public String getArg0() {
- return this.arg0;
- }
-
- /**
- *
- * @param arg0
- * the value for the arg0 property
- */
- public void setArg0(String arg0) {
- this.arg0 = arg0;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+public class Echo {
+
+ @XmlElement(name = "arg0", namespace = "")
+ private String arg0;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getArg0() {
+ return this.arg0;
+ }
+
+ /**
+ *
+ * @param arg0
+ * the value for the arg0 property
+ */
+ public void setArg0(String arg0) {
+ this.arg0 = arg0;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-public class EchoResponse {
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- /**
- *
- * @return
- * returns String
- */
- public String getReturn() {
- return this._return;
- }
-
- /**
- *
- * @param _return
- * the value for the _return property
- */
- public void setReturn(String _return) {
- this._return = _return;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+public class EchoResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
-public class Ping {
-
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+public class Ping {
+
+
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,45 +0,0 @@
-/*
- * 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 javax.security.auth.Subject;
-
-import com.sun.xml.wss.RealmAuthenticationAdapter;
-import com.sun.xml.wss.XWSSecurityException;
-
-/**
- * A simple realm authenticator showing how to override the WSIT default
- * (which is based on tomcat-users.xml when not running on Glassfish)
- *
- * @author alessio.soldano(a)jboss.com
- * @since 25-Apr-2008
- *
- */
-public class RealmAuthenticator extends RealmAuthenticationAdapter
-{
- @Override
- public boolean authenticate(Subject callerSubject, String username, String password) throws XWSSecurityException
- {
- System.out.println("Custom realm authenticator called: username=" + username + ", password=" + password);
- return (username.equals("kermit") && password.equals("thefrog"));
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,45 @@
+/*
+ * 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 javax.security.auth.Subject;
+
+import com.sun.xml.wss.RealmAuthenticationAdapter;
+import com.sun.xml.wss.XWSSecurityException;
+
+/**
+ * A simple realm authenticator showing how to override the WSIT default
+ * (which is based on tomcat-users.xml when not running on Glassfish)
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Apr-2008
+ *
+ */
+public class RealmAuthenticator extends RealmAuthenticationAdapter
+{
+ @Override
+ public boolean authenticate(Subject callerSubject, String username, String password) throws XWSSecurityException
+ {
+ System.out.println("Custom realm authenticator called: username=" + username + ", password=" + password);
+ return (username.equals("kermit") && password.equals("thefrog"));
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,35 +0,0 @@
-/*
- * 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 javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-(
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity"
-)
-public interface ServiceIface
-{
- @WebMethod
- String sayHello();
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,35 @@
+/*
+ * 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 javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,40 +0,0 @@
-/*
- * 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 javax.jws.WebService;
-
-@WebService
-(
- portName = "SecurityServicePort",
- serviceName = "SecurityService",
- wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.ServiceIface"
-)
-public class ServiceImpl implements ServiceIface
-{
- public String sayHello()
- {
- return "Secure Hello World!";
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,40 @@
+/*
+ * 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 javax.jws.WebService;
+
+@WebService
+(
+ portName = "SecurityServicePort",
+ serviceName = "SecurityService",
+ wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Secure Hello World!";
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,82 +0,0 @@
-/*
- * 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.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * WS-Security sign + encrypt test case
- *
- * @author alessio.soldano(a)jboss.com
- * @since 23-Apr-2008
- */
-public final class SignEncryptTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign-encrypt/SecurityService";
-
- public static Test suite()
- {
- addClientConfToClasspath("jaxws-samples-wsse-sign-encrypt-client.jar");
- return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt.war");
- }
-
- public void test() throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
-// BindingProvider bp = (BindingProvider)proxy;
-// bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit");
-// bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
-
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
-
- protected static void addClientConfToClasspath(String s)
- {
- try
- {
- // wrap the classloader upfront to allow inclusion of the client.jar
- JBossWSTestHelper helper = new JBossWSTestHelper();
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
- Thread.currentThread().setContextClassLoader(replacement);
- }
- catch (MalformedURLException e)
- {
- throw new IllegalStateException(e);
- }
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,82 @@
+/*
+ * 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.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security sign + encrypt test case
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Apr-2008
+ */
+public final class SignEncryptTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign-encrypt/SecurityService";
+
+ public static Test suite()
+ {
+ addClientConfToClasspath("jaxws-samples-wsse-sign-encrypt-client.jar");
+ return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt.war");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+// BindingProvider bp = (BindingProvider)proxy;
+// bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit");
+// bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
+
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ protected static void addClientConfToClasspath(String s)
+ {
+ try
+ {
+ // wrap the classloader upfront to allow inclusion of the client.jar
+ JBossWSTestHelper helper = new JBossWSTestHelper();
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
+ Thread.currentThread().setContextClassLoader(replacement);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException(e);
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,77 +0,0 @@
-/*
- * 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.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * WS-Security sign test case
- *
- * @author alessio.soldano(a)jboss.com
- * @since 23-Apr-2008
- */
-public final class SignTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign/SecurityService";
-
- public static Test suite()
- {
- addClientConfToClasspath("jaxws-samples-wsse-sign-client.jar");
- return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign.war");
- }
-
- public void test() throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
-
- protected static void addClientConfToClasspath(String s)
- {
- try
- {
- // wrap the classloader upfront to allow inclusion of the client.jar
- JBossWSTestHelper helper = new JBossWSTestHelper();
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
- Thread.currentThread().setContextClassLoader(replacement);
- }
- catch (MalformedURLException e)
- {
- throw new IllegalStateException(e);
- }
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,77 @@
+/*
+ * 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.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security sign test case
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Apr-2008
+ */
+public final class SignTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign/SecurityService";
+
+ public static Test suite()
+ {
+ addClientConfToClasspath("jaxws-samples-wsse-sign-client.jar");
+ return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign.war");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ protected static void addClientConfToClasspath(String s)
+ {
+ try
+ {
+ // wrap the classloader upfront to allow inclusion of the client.jar
+ JBossWSTestHelper helper = new JBossWSTestHelper();
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
+ Thread.currentThread().setContextClassLoader(replacement);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException(e);
+ }
+ }
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,82 +0,0 @@
-/*
- * 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.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * WS-Security username token profile test case
- *
- * @author alessio.soldano(a)jboss.com
- * @since 23-Apr-2008
- */
-public final class UsernameTestCase extends JBossWSTest
-{
- private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-username/SecurityService";
-
- public static Test suite()
- {
- addClientConfToClasspath("jaxws-samples-wsse-username-client.jar");
- return new JBossWSTestSetup(UsernameTestCase.class, "jaxws-samples-wsse-username.war");
- }
-
- public void test() throws Exception
- {
- System.setProperty("javax.net.ssl.trustStore", "/dati/jboss-4.2.2.GA/server/default/truststore_abc");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
- System.setProperty("javax.net.ssl.trustStoreType", "jks");
-
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
-
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
-
- protected static void addClientConfToClasspath(String s)
- {
- try
- {
- // wrap the classloader upfront to allow inclusion of the client.jar
- JBossWSTestHelper helper = new JBossWSTestHelper();
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
- Thread.currentThread().setContextClassLoader(replacement);
- }
- catch (MalformedURLException e)
- {
- throw new IllegalStateException(e);
- }
- }
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,82 @@
+/*
+ * 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.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security username token profile test case
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 23-Apr-2008
+ */
+public final class UsernameTestCase extends JBossWSTest
+{
+ private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-username/SecurityService";
+
+ public static Test suite()
+ {
+ addClientConfToClasspath("jaxws-samples-wsse-username-client.jar");
+ return new JBossWSTestSetup(UsernameTestCase.class, "jaxws-samples-wsse-username.war");
+ }
+
+ public void test() throws Exception
+ {
+ System.setProperty("javax.net.ssl.trustStore", "/dati/jboss-4.2.2.GA/server/default/truststore_abc");
+ System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
+ System.setProperty("javax.net.ssl.trustStoreType", "jks");
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ protected static void addClientConfToClasspath(String s)
+ {
+ try
+ {
+ // wrap the classloader upfront to allow inclusion of the client.jar
+ JBossWSTestHelper helper = new JBossWSTestHelper();
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent);
+ Thread.currentThread().setContextClassLoader(replacement);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException(e);
+ }
+ }
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class SayHello {
-
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHello {
+
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,36 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class SayHelloResponse {
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- /**
- *
- * @return
- * returns String
- */
- public String getReturn() {
- return this._return;
- }
-
- /**
- *
- * @param _return
- * the value for the _return property
- */
- public void setReturn(String _return) {
- this._return = _return;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHelloResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.jboss.test.ws.wsit.rm;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.WebResult;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- *
- * @author User
- */
-@WebService(
- targetNamespace = "http://calculator.me.org/",
- portName = "CalculatorWSPort",
- serviceName = "CalculatorWSService"
-)
-public class CalculatorWSImpl implements CalculatorWS
-{
-
- /**
- * Web service operation
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "add", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.Add")
- @ResponseWrapper(localName = "addResponse", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.AddResponse")
- public int add(
- @WebParam(name = "i", targetNamespace = "")
- int i,
- @WebParam(name = "j", targetNamespace = "")
- int j)
- {
-
- int result = i + j;
- System.out.println("*** WSIT-RM ***");
- System.out.println("Result is: " + result);
- return result;
- }
-
-}
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jboss.test.ws.wsit.rm;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.WebResult;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ *
+ * @author User
+ */
+@WebService(
+ targetNamespace = "http://calculator.me.org/",
+ portName = "CalculatorWSPort",
+ serviceName = "CalculatorWSService"
+)
+public class CalculatorWSImpl implements CalculatorWS
+{
+
+ /**
+ * Web service operation
+ */
+ @WebMethod
+ @WebResult(targetNamespace = "")
+ @RequestWrapper(localName = "add", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.Add")
+ @ResponseWrapper(localName = "addResponse", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.AddResponse")
+ public int add(
+ @WebParam(name = "i", targetNamespace = "")
+ int i,
+ @WebParam(name = "j", targetNamespace = "")
+ int j)
+ {
+
+ int result = i + j;
+ System.out.println("*** WSIT-RM ***");
+ System.out.println("Result is: " + result);
+ return result;
+ }
+
+}
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,37 +0,0 @@
-package org.jboss.test.ws.wsit.rm;
-
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-import javax.xml.namespace.QName;
-import java.net.URL;
-
-import com.sun.xml.ws.Closeable;
-
-
-public class RMTestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(RMTestCase.class, "wsit-rm.war");
- }
-
- public void testRMExchange() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/wsit-rm?wsdl");
- QName qName = new QName("http://calculator.me.org/", "CalculatorWSService");
-
- CalculatorWSService service = new CalculatorWSService(url,qName);
- CalculatorWS port = service.getCalculatorWSPort();
-
- int i = 10;
- int j = 20;
-
- int result = port.add(i, j);
- assertTrue(result == 30);
-
- ((Closeable)port).close();
- }
-}
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/wsit/rm/RMTestCase.java 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,37 @@
+package org.jboss.test.ws.wsit.rm;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import javax.xml.namespace.QName;
+import java.net.URL;
+
+import com.sun.xml.ws.Closeable;
+
+
+public class RMTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMTestCase.class, "wsit-rm.war");
+ }
+
+ public void testRMExchange() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/wsit-rm?wsdl");
+ QName qName = new QName("http://calculator.me.org/", "CalculatorWSService");
+
+ CalculatorWSService service = new CalculatorWSService(url,qName);
+ CalculatorWS port = service.getCalculatorWSPort();
+
+ int i = 10;
+ int j = 20;
+
+ int result = port.add(i, j);
+ assertTrue(result == 30);
+
+ ((Closeable)port).close();
+ }
+}
+
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869 (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>Endpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1869.JBWS1869EndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Endpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>Delegate</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1869.DelegationServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Delegate</servlet-name>
- <url-pattern>/delegate</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1869/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1869.JBWS1869EndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>Delegate</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1869.DelegationServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Delegate</servlet-name>
+ <url-pattern>/delegate</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871 (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>Endpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Endpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>AddressingService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AddressingService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>AddressingService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddressingService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" name="AddressingService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" schemaLocation="AddressingService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="AddressingServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="AddressingService">
- <port name="AddressingServicePort" binding="tns:AddressingServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/>
- </port>
- </service>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" name="AddressingService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" schemaLocation="AddressingService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="AddressingServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="AddressingService">
+ <port name="AddressingServicePort" binding="tns:AddressingServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/>
+ </port>
+ </service>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>SimpleService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SimpleService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>SimpleService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SimpleService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:UsingPolicy/>
- <wsp:Policy
- wsu:Id="wsrm11policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
- <wsp:All>
- <wsp:ExactlyOne>
- <wsp:All>
- <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/>
- <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:All>
- </wsp:Policy>
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" schemaLocation="SimpleService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="ping">
- <part name="parameters" element="tns:ping"/>
- </message>
- <message name="echo">
- <part name="parameters" element="tns:echo"/>
- </message>
- <message name="echoResponse">
- <part name="parameters" element="tns:echoResponse"/>
- </message>
- <portType name="SimpleService">
- <operation name="ping">
- <input message="tns:ping"/>
- </operation>
- <operation name="echo">
- <input message="tns:echo"/>
- <output message="tns:echoResponse"/>
- </operation>
- </portType>
- <binding name="SimpleServicePortBinding" type="tns:SimpleService">
- <wsp:PolicyReference URI="#wsrm11policy"/>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="ping">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- </operation>
- <operation name="echo">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="SimpleService">
- <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:UsingPolicy/>
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/>
+ <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:All>
+ </wsp:Policy>
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" schemaLocation="SimpleService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="ping">
+ <part name="parameters" element="tns:ping"/>
+ </message>
+ <message name="echo">
+ <part name="parameters" element="tns:echo"/>
+ </message>
+ <message name="echoResponse">
+ <part name="parameters" element="tns:echoResponse"/>
+ </message>
+ <portType name="SimpleService">
+ <operation name="ping">
+ <input message="tns:ping"/>
+ </operation>
+ <operation name="echo">
+ <input message="tns:echo"/>
+ <output message="tns:echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="SimpleServicePortBinding" type="tns:SimpleService">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="ping">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SimpleService">
+ <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="echo" type="tns:echo"/>
-
- <xs:element name="echoResponse" type="tns:echoResponse"/>
-
- <xs:element name="ping" type="tns:ping"/>
-
- <xs:complexType name="echo">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="echoResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ping">
- <xs:sequence/>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="echo" type="tns:echo"/>
+
+ <xs:element name="echoResponse" type="tns:echoResponse"/>
+
+ <xs:element name="ping" type="tns:ping"/>
+
+ <xs:complexType name="echo">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="echoResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ping">
+ <xs:sequence/>
+ </xs:complexType>
+</xs:schema>
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- name="SimpleService"
- targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:Policy
- wsu:Id="wsrm11policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
- <wsp:All>
- <wsp:ExactlyOne>
- <wsp:All>
- <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/>
- <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:All>
- </wsp:Policy>
- <message name="ping"/>
- <message name="echo"/>
- <message name="echoResponse"/>
- <portType name="SimpleService">
- <operation name="ping">
- <input message="tns:ping"/>
- </operation>
- <operation name="echo">
- <input message="tns:echo"/>
- <output message="tns:echoResponse"/>
- </operation>
- </portType>
- <binding name="SimpleServicePortBinding" type="tns:SimpleService">
- <wsp:PolicyReference URI="#wsrm11policy"/>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="ping">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- </operation>
- <operation name="echo">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="SimpleService">
- <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ name="SimpleService"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/>
+ <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:All>
+ </wsp:Policy>
+ <message name="ping"/>
+ <message name="echo"/>
+ <message name="echoResponse"/>
+ <portType name="SimpleService">
+ <operation name="ping">
+ <input message="tns:ping"/>
+ </operation>
+ <operation name="echo">
+ <input message="tns:echo"/>
+ <output message="tns:echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="SimpleServicePortBinding" type="tns:SimpleService">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="ping">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SimpleService">
+ <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks)
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <portType name="ServiceIface"/>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
- </service>
- <wsp:Policy wsu:Id="ClientKeystorePolicy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sc:KeyStore wspp:visibility="private"
- location="client-keystore.jks"
- type="JKS"
- alias="xws-security-client"
- storepass="changeit">
- </sc:KeyStore>
- <sc:TrustStore wspp:visibility="private"
- location="client-truststore.jks"
- type="JKS"
- peeralias="xws-security-server"
- storepass="changeit">
- </sc:TrustStore>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <portType name="ServiceIface"/>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
+ </service>
+ <wsp:Policy wsu:Id="ClientKeystorePolicy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sc:KeyStore wspp:visibility="private"
+ location="client-keystore.jks"
+ type="JKS"
+ alias="xws-security-client"
+ storepass="changeit">
+ </sc:KeyStore>
+ <sc:TrustStore wspp:visibility="private"
+ location="client-truststore.jks"
+ type="JKS"
+ peeralias="xws-security-server"
+ storepass="changeit">
+ </sc:TrustStore>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>SecurityService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SecurityService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>SecurityService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SecurityService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- </wsp:Policy>
- </sp:Wss11>
- <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
- <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
+ <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <message name="sayHello"/>
- <message name="sayHelloResponse"/>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- </wsp:Policy>
- </sp:Wss11>
- <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
- <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <message name="sayHello"/>
+ <message name="sayHelloResponse"/>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
+ <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks)
===================================================================
(Binary files differ)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks)
===================================================================
(Binary files differ)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <portType name="ServiceIface"/>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
- </service>
- <wsp:Policy wsu:Id="ClientKeystorePolicy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sc:KeyStore wspp:visibility="private"
- location="client-keystore.jks"
- type="JKS"
- alias="xws-security-client"
- storepass="changeit">
- </sc:KeyStore>
- <sc:TrustStore wspp:visibility="private"
- location="client-truststore.jks"
- type="JKS"
- peeralias="xws-security-server"
- storepass="changeit">
- </sc:TrustStore>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <portType name="ServiceIface"/>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
+ </service>
+ <wsp:Policy wsu:Id="ClientKeystorePolicy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sc:KeyStore wspp:visibility="private"
+ location="client-keystore.jks"
+ type="JKS"
+ alias="xws-security-client"
+ storepass="changeit">
+ </sc:KeyStore>
+ <sc:TrustStore wspp:visibility="private"
+ location="client-truststore.jks"
+ type="JKS"
+ peeralias="xws-security-server"
+ storepass="changeit">
+ </sc:TrustStore>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>SecurityService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SecurityService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>SecurityService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SecurityService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- </wsp:Policy>
- </sp:Wss11>
- <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
- <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
+ <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <message name="sayHello"/>
- <message name="sayHelloResponse"/>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- </wsp:Policy>
- </sp:Wss11>
- <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
- <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <message name="sayHello"/>
+ <message name="sayHelloResponse"/>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/>
+ <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1 +0,0 @@
-org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <portType name="ServiceIface"/>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
- </service>
- <wsp:Policy wsu:Id="ClientKeystorePolicy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sc:CallbackHandlerConfiguration>
- <sc:CallbackHandler name="usernameHandler" default="kermit"/>
- <sc:CallbackHandler name="passwordHandler" default="thefrog"/>
- </sc:CallbackHandlerConfiguration>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <portType name="ServiceIface"/>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <wsp:PolicyReference URI="#ClientKeystorePolicy"/>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/>
+ </service>
+ <wsp:Policy wsu:Id="ClientKeystorePolicy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sc:CallbackHandlerConfiguration>
+ <sc:CallbackHandler name="usernameHandler" default="kermit"/>
+ <sc:CallbackHandler name="passwordHandler" default="thefrog"/>
+ </sc:CallbackHandlerConfiguration>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>SecurityService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SecurityService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>SecurityService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SecurityService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:TransportBinding>
- <wsp:Policy>
- <sp:TransportToken>
- <wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
- </wsp:Policy>
- </sp:TransportToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:TransportBinding>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SignedSupportingTokens>
- <wsp:Policy>
- <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT...">
- <wsp:Policy>
- <sp:WssUsernameToken10/>
- </wsp:Policy>
- </sp:UsernameToken>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:TransportBinding>
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken RequireClientCertificate="false"/>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedSupportingTokens>
+ <wsp:Policy>
+ <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT...">
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
- xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
- xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <message name="sayHello"/>
- <message name="sayHelloResponse"/>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-
- <!-- Policy definitions -->
- <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:TransportBinding>
- <wsp:Policy>
- <sp:TransportToken>
- <wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
- </wsp:Policy>
- </sp:TransportToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:TransportBinding>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SignedSupportingTokens>
- <wsp:Policy>
- <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT...">
- <wsp:Policy>
- <sp:WssUsernameToken10/>
- </wsp:Policy>
- </sp:UsernameToken>
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"
+ xmlns:sc="http://schemas.sun.com/2006/03/wss/server"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <message name="sayHello"/>
+ <message name="sayHelloResponse"/>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+
+ <!-- Policy definitions -->
+ <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:TransportBinding>
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken RequireClientCertificate="false"/>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedSupportingTokens>
+ <wsp:Policy>
+ <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT...">
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,83 +0,0 @@
-#
-# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
-#
-
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-1674] Fix @WebServiceRef with Metro
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# [JBWS-1673] Fix JAXR samples for Metro
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-
-# [JBWS-2128] DefaultHttpContext is not a supported context.
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1357/**
-org/jboss/test/ws/jaxws/jbws1422/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1566/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1762/**
-org/jboss/test/ws/jaxws/jbws1797/**
-org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1845/**
-org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2013] Implement standard messge context properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
-org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [JBWS-2132] IllegalArgumentException: protocol = http host = null
-org/jboss/test/ws/jaxws/jbws1798/**
-org/jboss/test/ws/jaxws/jbws1843/**
-org/jboss/test/ws/jaxws/jbws2009/**
-
-# [JBWS-2133] Failed to access the WSDL
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2134] Fault string, and possibly fault code, not set
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2135] WebServiceException: Undefined port type
-org/jboss/test/ws/jaxws/jbws1822/**
-
-# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
-org/jboss/test/ws/jaxws/namespace/**
-
-# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-2029] Make the project generator available for all stacks
-org/jboss/test/ws/projectGenerator/**
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,83 @@
+#
+# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
+#
+
+# [JBWS-1178] Multiple virtual host and soap:address problem
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-1674] Fix @WebServiceRef with Metro
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-1673] Fix JAXR samples for Metro
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
+org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2128] DefaultHttpContext is not a supported context.
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2129] Wrapper class is not found
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1357/**
+org/jboss/test/ws/jaxws/jbws1422/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1566/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1797/**
+org/jboss/test/ws/jaxws/jbws1799/**
+org/jboss/test/ws/jaxws/jbws1845/**
+org/jboss/test/ws/jaxws/jbws1872/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2013] Implement standard messge context properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2130] WebServiceException: null is not a valid service
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [JBWS-2132] IllegalArgumentException: protocol = http host = null
+org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxws/jbws1843/**
+org/jboss/test/ws/jaxws/jbws2009/**
+
+# [JBWS-2133] Failed to access the WSDL
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-2134] Fault string, and possibly fault code, not set
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [JBWS-2135] WebServiceException: Undefined port type
+org/jboss/test/ws/jaxws/jbws1822/**
+
+# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
+org/jboss/test/ws/jaxws/namespace/**
+
+# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,83 +0,0 @@
-#
-# $Id$
-#
-
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-1674] Fix @WebServiceRef with Metro
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# [JBWS-1673] Fix JAXR samples for Metro
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-
-# [JBWS-2128] DefaultHttpContext is not a supported context.
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1357/**
-org/jboss/test/ws/jaxws/jbws1422/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1566/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1762/**
-org/jboss/test/ws/jaxws/jbws1797/**
-org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1845/**
-org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2013] Implement standard messge context properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
-org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [JBWS-2132] IllegalArgumentException: protocol = http host = null
-org/jboss/test/ws/jaxws/jbws1798/**
-org/jboss/test/ws/jaxws/jbws1843/**
-org/jboss/test/ws/jaxws/jbws2009/**
-
-# [JBWS-2133] Failed to access the WSDL
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2134] Fault string, and possibly fault code, not set
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2135] WebServiceException: Undefined port type
-org/jboss/test/ws/jaxws/jbws1822/**
-
-# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
-org/jboss/test/ws/jaxws/namespace/**
-
-# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-2029] Make the project generator available for all stacks
-org/jboss/test/ws/projectGenerator/**
-
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,83 @@
+#
+# $Id$
+#
+
+# [JBWS-1178] Multiple virtual host and soap:address problem
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-1674] Fix @WebServiceRef with Metro
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-1673] Fix JAXR samples for Metro
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
+org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2128] DefaultHttpContext is not a supported context.
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2129] Wrapper class is not found
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1357/**
+org/jboss/test/ws/jaxws/jbws1422/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1566/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1797/**
+org/jboss/test/ws/jaxws/jbws1799/**
+org/jboss/test/ws/jaxws/jbws1845/**
+org/jboss/test/ws/jaxws/jbws1872/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2013] Implement standard messge context properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2130] WebServiceException: null is not a valid service
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [JBWS-2132] IllegalArgumentException: protocol = http host = null
+org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxws/jbws1843/**
+org/jboss/test/ws/jaxws/jbws2009/**
+
+# [JBWS-2133] Failed to access the WSDL
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-2134] Fault string, and possibly fault code, not set
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [JBWS-2135] WebServiceException: Undefined port type
+org/jboss/test/ws/jaxws/jbws1822/**
+
+# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
+org/jboss/test/ws/jaxws/namespace/**
+
+# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
+
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,88 +0,0 @@
-#
-# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
-#
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-1673] Fix JAXR samples for Metro
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/jbws1840/**
-
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-
-# [JBWS-2128] DefaultHttpContext is not a supported context.
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1357/**
-org/jboss/test/ws/jaxws/jbws1422/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1566/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1762/**
-org/jboss/test/ws/jaxws/jbws1797/**
-org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1845/**
-org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2013] Implement standard messge context properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
-org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [JBWS-2132] IllegalArgumentException: protocol = http host = null
-org/jboss/test/ws/jaxws/jbws1798/**
-org/jboss/test/ws/jaxws/jbws1843/**
-org/jboss/test/ws/jaxws/jbws2009/**
-
-# [JBWS-2133] Failed to access the WSDL
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2134] Fault string, and possibly fault code, not set
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2135] WebServiceException: Undefined port type
-org/jboss/test/ws/jaxws/jbws1822/**
-
-# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
-org/jboss/test/ws/jaxws/namespace/**
-
-# [JBWS-2137] @WebWservice does not work with class isolation
-org/jboss/test/ws/jaxws/jbws1556/**
-
-# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-2029] Make the project generator available for all stacks
-org/jboss/test/ws/projectGenerator/**
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,88 @@
+#
+# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
+#
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-1178] Multiple virtual host and soap:address problem
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-1673] Fix JAXR samples for Metro
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
+
+# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
+org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2128] DefaultHttpContext is not a supported context.
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2129] Wrapper class is not found
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1357/**
+org/jboss/test/ws/jaxws/jbws1422/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1566/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1797/**
+org/jboss/test/ws/jaxws/jbws1799/**
+org/jboss/test/ws/jaxws/jbws1845/**
+org/jboss/test/ws/jaxws/jbws1872/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2013] Implement standard messge context properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2130] WebServiceException: null is not a valid service
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [JBWS-2132] IllegalArgumentException: protocol = http host = null
+org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxws/jbws1843/**
+org/jboss/test/ws/jaxws/jbws2009/**
+
+# [JBWS-2133] Failed to access the WSDL
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-2134] Fault string, and possibly fault code, not set
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [JBWS-2135] WebServiceException: Undefined port type
+org/jboss/test/ws/jaxws/jbws1822/**
+
+# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
+org/jboss/test/ws/jaxws/namespace/**
+
+# [JBWS-2137] @WebWservice does not work with class isolation
+org/jboss/test/ws/jaxws/jbws1556/**
+
+# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,103 +0,0 @@
-#
-# $Id$
-#
-
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-1673] Fix JAXR samples for Metro
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# TODO: Fix classpath to ClientLauncher
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/jbws1840/**
-
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-
-# [JBWS-2128] DefaultHttpContext is not a supported context.
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
-org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1357/**
-org/jboss/test/ws/jaxws/jbws1422/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1566/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1762/**
-org/jboss/test/ws/jaxws/jbws1797/**
-org/jboss/test/ws/jaxws/jbws1799/**
-org/jboss/test/ws/jaxws/jbws1845/**
-org/jboss/test/ws/jaxws/jbws1872/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws2000/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2013] Implement standard messge context properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
-org/jboss/test/ws/jaxws/jbws1702/**
-org/jboss/test/ws/jaxws/jbws1733/**
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [JBWS-2132] IllegalArgumentException: protocol = http host = null
-org/jboss/test/ws/jaxws/jbws1798/**
-org/jboss/test/ws/jaxws/jbws1843/**
-org/jboss/test/ws/jaxws/jbws2009/**
-
-# [JBWS-2133] Failed to access the WSDL
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2134] Fault string, and possibly fault code, not set
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2135] WebServiceException: Undefined port type
-org/jboss/test/ws/jaxws/jbws1822/**
-
-# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
-org/jboss/test/ws/jaxws/namespace/**
-
-# [JBAS-5359] mapped-name is required for context of deployment
-org/jboss/test/ws/jaxws/jbws1611/**
-
-# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
-org/jboss/test/ws/jaxws/samples/advanced/retail/**
-org/jboss/test/ws/jaxws/samples/context/**
-org/jboss/test/ws/jaxws/samples/eardeployment/**
-org/jboss/test/ws/jaxws/samples/swaref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-
-# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
-org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
-org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-2029] Make the project generator available for all stacks
-org/jboss/test/ws/projectGenerator/**
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,103 @@
+#
+# $Id$
+#
+
+# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-1178] Multiple virtual host and soap:address problem
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-1673] Fix JAXR samples for Metro
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# TODO: Fix classpath to ClientLauncher
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
+
+# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
+org/jboss/test/ws/jaxws/wsrm/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2128] DefaultHttpContext is not a supported context.
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2129] Wrapper class is not found
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1357/**
+org/jboss/test/ws/jaxws/jbws1422/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1566/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1797/**
+org/jboss/test/ws/jaxws/jbws1799/**
+org/jboss/test/ws/jaxws/jbws1845/**
+org/jboss/test/ws/jaxws/jbws1872/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2013] Implement standard messge context properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2130] WebServiceException: null is not a valid service
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [JBWS-2132] IllegalArgumentException: protocol = http host = null
+org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxws/jbws1843/**
+org/jboss/test/ws/jaxws/jbws2009/**
+
+# [JBWS-2133] Failed to access the WSDL
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-2134] Fault string, and possibly fault code, not set
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [JBWS-2135] WebServiceException: Undefined port type
+org/jboss/test/ws/jaxws/jbws1822/**
+
+# [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
+org/jboss/test/ws/jaxws/namespace/**
+
+# [JBAS-5359] mapped-name is required for context of deployment
+org/jboss/test/ws/jaxws/jbws1611/**
+
+# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
+org/jboss/test/ws/jaxws/samples/advanced/retail/**
+org/jboss/test/ws/jaxws/samples/context/**
+org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/swaref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/webservice/**
+
+# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars
+org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm)
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-
-<sun-web-app error-url="">
- <context-root>/CalculatorApp</context-root>
- <class-loader delegate="true"/>
- <jsp-config>
- <property name="keepgenerated" value="true">
- <description>Keep a copy of the generated servlet class' java code.</description>
- </property>
- </jsp-config>
-</sun-web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/sun-web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
+
+<sun-web-app error-url="">
+ <context-root>/CalculatorApp</context-root>
+ <class-loader delegate="true"/>
+ <jsp-config>
+ <property name="keepgenerated" value="true">
+ <description>Keep a copy of the generated servlet class' java code.</description>
+ </property>
+ </jsp-config>
+</sun-web-app>
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>org.jboss.test.ws.wsit.rm.CalculatorWSImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/web.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>org.jboss.test.ws.wsit.rm.CalculatorWSImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl)
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
-<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://calculator.me.org/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://calculator.me.org/"
- name="CalculatorWSService">
-
- <wsp:UsingPolicy></wsp:UsingPolicy>
- <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <ns1:RMAssertion xmlns:ns1="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"></ns1:RMAssertion>
- <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"></ns2:UsingAddressing>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <types>
- <xsd:schema>
- <!-- http://calculator.me.org/ -->
- <xsd:import namespace="http://calculator.me.org/" schemaLocation="xsd1.xsd"></xsd:import>
- </xsd:schema>
-
- </types>
- <message name="add">
- <part name="parameters" element="tns:add"></part>
- </message>
- <message name="addResponse">
- <part name="parameters" element="tns:addResponse"></part>
- </message>
- <portType name="CalculatorWS">
- <operation name="add">
- <input message="tns:add"></input>
- <output message="tns:addResponse"></output>
- </operation>
- </portType>
- <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS">
- <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"></wsp:PolicyReference>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
- <operation name="add">
-
- <soap:operation soapAction=""></soap:operation>
- <input>
- <soap:body use="literal"></soap:body>
- </input>
- <output>
- <soap:body use="literal"></soap:body>
- </output>
- </operation>
- </binding>
- <service name="CalculatorWSService">
- <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding">
- <soap:address location="http://127.0.0.1:8080/wsit-rm"></soap:address>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/Calc.wsdl 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
+<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://calculator.me.org/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ targetNamespace="http://calculator.me.org/"
+ name="CalculatorWSService">
+
+ <wsp:UsingPolicy></wsp:UsingPolicy>
+ <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <ns1:RMAssertion xmlns:ns1="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"></ns1:RMAssertion>
+ <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"></ns2:UsingAddressing>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <types>
+ <xsd:schema>
+ <!-- http://calculator.me.org/ -->
+ <xsd:import namespace="http://calculator.me.org/" schemaLocation="xsd1.xsd"></xsd:import>
+ </xsd:schema>
+
+ </types>
+ <message name="add">
+ <part name="parameters" element="tns:add"></part>
+ </message>
+ <message name="addResponse">
+ <part name="parameters" element="tns:addResponse"></part>
+ </message>
+ <portType name="CalculatorWS">
+ <operation name="add">
+ <input message="tns:add"></input>
+ <output message="tns:addResponse"></output>
+ </operation>
+ </portType>
+ <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS">
+ <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"></wsp:PolicyReference>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
+ <operation name="add">
+
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal"></soap:body>
+ </output>
+ </operation>
+ </binding>
+ <service name="CalculatorWSService">
+ <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding">
+ <soap:address location="http://127.0.0.1:8080/wsit-rm"></soap:address>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
-<xs:schema xmlns:tns="http://calculator.me.org/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- version="1.0"
- targetNamespace="http://calculator.me.org/">
-
- <xs:element name="add" type="tns:add"></xs:element>
-
- <xs:element name="addResponse" type="tns:addResponse"></xs:element>
-
- <xs:complexType name="add">
- <xs:sequence>
- <xs:element name="i" type="xs:int"></xs:element>
- <xs:element name="j" type="xs:int"></xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="addResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:int"></xs:element>
- </xs:sequence>
-
- </xs:complexType>
-</xs:schema>
\ No newline at end of file
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsdl/xsd1.xsd 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.2_01-hudson-189-. -->
+<xs:schema xmlns:tns="http://calculator.me.org/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ version="1.0"
+ targetNamespace="http://calculator.me.org/">
+
+ <xs:element name="add" type="tns:add"></xs:element>
+
+ <xs:element name="addResponse" type="tns:addResponse"></xs:element>
+
+ <xs:complexType name="add">
+ <xs:sequence>
+ <xs:element name="i" type="xs:int"></xs:element>
+ <xs:element name="j" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="addResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"></xs:element>
+ </xs:sequence>
+
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="CalculatorWSService" targetNamespace="http://calculator.me.org/" xmlns:tns="http://calculator.me.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
->
- <message name="add"/>
- <message name="addResponse"/>
- <portType name="CalculatorWS">
- <operation name="add">
- <input message="tns:add"/>
- <output message="tns:addResponse"/>
- </operation>
- </portType>
- <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS">
- <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"/>
- <operation name="add">
- <input/>
- <output/>
- </operation>
- </binding>
- <service name="CalculatorWSService">
- <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"/>
- </service>
- <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy">
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
- <wsrm:RMAssertion/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-</definitions>
Copied: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/wsit/rm/WEB-INF/wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="CalculatorWSService" targetNamespace="http://calculator.me.org/" xmlns:tns="http://calculator.me.org/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+>
+ <message name="add"/>
+ <message name="addResponse"/>
+ <portType name="CalculatorWS">
+ <operation name="add">
+ <input message="tns:add"/>
+ <output message="tns:addResponse"/>
+ </operation>
+ </portType>
+ <binding name="CalculatorWSPortBinding" type="tns:CalculatorWS">
+ <wsp:PolicyReference URI="#CalculatorWSPortBindingPolicy"/>
+ <operation name="add">
+ <input/>
+ <output/>
+ </operation>
+ </binding>
+ <service name="CalculatorWSService">
+ <port name="CalculatorWSPort" binding="tns:CalculatorWSPortBinding"/>
+ </service>
+ <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
+ <wsrm:RMAssertion/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+</definitions>
Deleted: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,300 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Testsuite</name>
- <artifactId>jbossws-metro-testsuite</artifactId>
- <packaging>pom</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Properties -->
- <properties>
- <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args>
- <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
- </properties>
-
- <!-- Modules -->
- <modules>
- <module>metro-tests</module>
- <module>framework-tests</module>
- </modules>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro-client</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- Build -->
- <build>
- <testResources>
- <!-- copy etc files -->
- <testResource>
- <directory>src/test/etc</directory>
- </testResource>
- <!-- copy handler definitions -->
- <testResource>
- <targetPath>../test-classes</targetPath>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <!-- copy non binary files -->
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.wsdl</include>
- <include>**/*.xml</include>
- </includes>
- <filtering>true</filtering>
- </testResource>
- <!-- copy binary files -->
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>src/test/resources</directory>
- <excludes>
- <exclude>**/*.wsdl</exclude>
- <exclude>**/*.xml</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args}</argLine>
- <!--argLine>${surefire.jdpw.args}</argLine-->
- <systemProperties>
- <property>
- <name>java.naming.provider.url</name>
- <value>jnp://${jboss.bind.address}:1099</value>
- </property>
- <property>
- <name>java.util.logging.manager</name>
- <value>org.jboss.wsf.common.logging.JDKLogManager</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>jbossws.integration.target</name>
- <value>${jbossws.integration.target}</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>${project.build.directory}/test-log</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- <property>
- <name>test.resources.directory</name>
- <value>${project.build.directory}/test-resources</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss422</id>
- <properties>
- <jboss.version>4.2.2.GA</jboss.version>
- <jbossws.integration.target>jboss422</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jboss.version>4.2.3-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss500
- Descr: JBoss-5.0.0 specific options
- -->
- <profile>
- <id>jboss500</id>
- <properties>
- <jboss.version>5.0.0.Beta4</jboss.version>
- <jbossws.integration.target>jboss500</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
- -->
- <profile>
- <id>jboss501</id>
- <properties>
- <jboss.version>5.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: no-jboss-bind-address
- Descr: Set the default jboss.bind.address
-
- command line cannot overwrite pom properties
- http://jira.codehaus.org/browse/MNG-3546
- -->
- <profile>
- <id>no-jboss-bind-address</id>
- <activation>
- <property>
- <name>!jboss.bind.address</name>
- </property>
- </activation>
- <properties>
- <jboss.bind.address>localhost</jboss.bind.address>
- </properties>
- </profile>
- </profiles>
-
-</project>
Copied: stack/metro/trunk/modules/testsuite/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml)
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,300 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Testsuite</name>
+ <artifactId>jbossws-metro-testsuite</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
+ </properties>
+
+ <!-- Modules -->
+ <modules>
+ <module>metro-tests</module>
+ <module>framework-tests</module>
+ </modules>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro-client</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <testResources>
+ <!-- copy etc files -->
+ <testResource>
+ <directory>src/test/etc</directory>
+ </testResource>
+ <!-- copy handler definitions -->
+ <testResource>
+ <targetPath>../test-classes</targetPath>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ <!-- copy non binary files -->
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.wsdl</include>
+ <include>**/*.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ <!-- copy binary files -->
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/*.wsdl</exclude>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <!--argLine>${surefire.jdpw.args}</argLine-->
+ <systemProperties>
+ <property>
+ <name>java.naming.provider.url</name>
+ <value>jnp://${jboss.bind.address}:1099</value>
+ </property>
+ <property>
+ <name>java.util.logging.manager</name>
+ <value>org.jboss.wsf.common.logging.JDKLogManager</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>jbossws.integration.target</name>
+ <value>${jbossws.integration.target}</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>${project.build.directory}/test-log</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
+ <name>test.resources.directory</name>
+ <value>${project.build.directory}/test-resources</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <properties>
+ <jboss.version>4.2.2.GA</jboss.version>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.3 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <properties>
+ <jboss.version>4.2.3-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss423</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <properties>
+ <jboss.version>5.0.0.Beta4</jboss.version>
+ <jbossws.integration.target>jboss500</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jboss.version>5.0.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: no-jboss-bind-address
+ Descr: Set the default jboss.bind.address
+
+ command line cannot overwrite pom properties
+ http://jira.codehaus.org/browse/MNG-3546
+ -->
+ <profile>
+ <id>no-jboss-bind-address</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss.bind.address>localhost</jboss.bind.address>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Copied: stack/metro/trunk/modules/wsit (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit)
Property changes on: stack/metro/trunk/modules/wsit
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/metro/trunk/modules/wsit/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/wsit/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,54 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Metro Interoperability</name>
- <artifactId>jbossws-metro-wsit</artifactId>
- <packaging>pom</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-metro</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>wsit-rt</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.wsit</groupId>
- <artifactId>wsit-tools</artifactId>
- </dependency>
- </dependencies>
-
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-wsit-rt.xml</descriptor>
- <descriptor>src/main/scripts/assembly-wsit-tools.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>jbossws-metro-wsit</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: stack/metro/trunk/modules/wsit/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/pom.xml)
===================================================================
--- stack/metro/trunk/modules/wsit/pom.xml (rev 0)
+++ stack/metro/trunk/modules/wsit/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Interoperability</name>
+ <artifactId>jbossws-metro-wsit</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>wsit-rt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>wsit-tools</artifactId>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-wsit-rt.xml</descriptor>
+ <descriptor>src/main/scripts/assembly-wsit-tools.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jbossws-metro-wsit</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: stack/metro/trunk/modules/wsit/src (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src)
Copied: stack/metro/trunk/modules/wsit/src/main (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main)
Copied: stack/metro/trunk/modules/wsit/src/main/etc (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/etc)
Copied: stack/metro/trunk/modules/wsit/src/main/etc/META-INF (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/etc/META-INF)
Copied: stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/etc/META-INF/services)
Deleted: stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,2 +0,0 @@
-com.sun.tools.ws.policy.jaxws.PolicyExtensionHandler
-
Copied: stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler)
===================================================================
--- stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler (rev 0)
+++ stack/metro/trunk/modules/wsit/src/main/etc/META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,2 @@
+com.sun.tools.ws.policy.jaxws.PolicyExtensionHandler
+
Copied: stack/metro/trunk/modules/wsit/src/main/scripts (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts)
Deleted: stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,39 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>rt</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>*:wsit-rt:jar</include>
- </includes>
- <unpackOptions>
- <excludes>
- <exclude>WEB-INF/**</exclude>
- </excludes>
- </unpackOptions>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/wsdl</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>*:wsit-rt:jar</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>WEB-INF/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml)
===================================================================
--- stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml (rev 0)
+++ stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-rt.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,39 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>rt</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:wsit-rt:jar</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>WEB-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/wsdl</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:wsit-rt:jar</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>WEB-INF/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Deleted: stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,30 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>tools</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>*:wsit-tools:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>src/main/etc</directory>
- <includes>
- <include>META-INF/services/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml)
===================================================================
--- stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml (rev 0)
+++ stack/metro/trunk/modules/wsit/src/main/scripts/assembly-wsit-tools.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,30 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>tools</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:wsit-tools:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>src/main/etc</directory>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Copied: stack/metro/trunk/pom.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/pom.xml)
===================================================================
--- stack/metro/trunk/pom.xml (rev 0)
+++ stack/metro/trunk/pom.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <packaging>pom</packaging>
+
+ <version>3.0.2-SNAPSHOT</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Modules -->
+ <modules>
+ <module>modules/management</module>
+ <module>modules/server</module>
+ <module>modules/client</module>
+ <module>modules/wsit</module>
+ </modules>
+
+ <!-- Properties -->
+ <properties>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version>
+ <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version>
+ <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxrpc.api.version>1.1</jaxrpc.api.version>
+ <juddi.service.version>1.2.0.GA</juddi.service.version>
+ <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
+ <sun.jaxws.version>2.1.3</sun.jaxws.version>
+ <sun.wsit.version>1.1</sun.wsit.version>
+ <woodstox.version>3.1.1</woodstox.version>
+ </properties>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${jbossws.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- provided apis -->
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Metro dependencies -->
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>${sun.fastinfoset.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>http</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-local-transport</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>wsit-rt</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>wsit-tools</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>txnannprocessor</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmldsig</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
+ <artifactId>xws-security</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>${jaxrpc.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ <version>${woodstox.version}</version>
+ </dependency>
+
+ <!-- jboss provided -->
+ <dependency>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- transitve dependencies -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>${juddi.service.version}</version>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>container</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>container</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>resources</classifier>
+ <scope>provided</scope>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate-jboss-home</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo/>
+ <echo message="profile=${jbossws.integration.target}"/>
+ <echo message="jboss.home=${jboss.home}"/>
+ <echo/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>deploy-artifacts</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <!--
+ Cannot bind to lifecycle with multiple modules
+ http://jira.codehaus.org/browse/MASSEMBLY-319
+ <executions>
+ <execution>
+ <id>build-deploy-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions-->
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+ <!--
+ Name: bindist
+ Descr: Build the binary distribution
+ -->
+ <profile>
+ <id>bindist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>jbossws-metro-dist</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss422
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss422</id>
+ <properties>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ <jboss.home>${jboss422.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss423
+ Descr: JBoss-4.2.2 specific options
+ -->
+ <profile>
+ <id>jboss423</id>
+ <properties>
+ <jbossws.integration.target>jboss423</jbossws.integration.target>
+ <jboss.home>${jboss423.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss500
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss500</id>
+ <properties>
+ <jbossws.integration.target>jboss500</jbossws.integration.target>
+ <jboss.home>${jboss500.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.0 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.home>${jboss501.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
+ Name: testsuite
+ Descr: Executes the testsuite
+ -->
+ <profile>
+ <id>testsuite</id>
+ <modules>
+ <module>modules/testsuite</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>maven2.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+</project>
Property changes on: stack/metro/trunk/src
___________________________________________________________________
Name: svn:externals
- test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/testsuite/test
Copied: stack/metro/trunk/src/main/distro/ant.properties (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties)
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties (rev 0)
+++ stack/metro/trunk/src/main/distro/ant.properties 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,28 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+jboss422.home=(a)jboss422.home@
+jboss423.home=(a)jboss423.home@
+jboss500.home=(a)jboss500.home@
+jboss501.home=(a)jboss501.home@
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBoss JMX invoker authentication
+#jmx.authentication.username=admin
+#jmx.authentication.password=admin
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Deleted: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,31 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
-
-# Optional JBoss Home
-jboss422.home=(a)jboss422.home@
-jboss423.home=(a)jboss423.home@
-jboss500.home=(a)jboss500.home@
-jboss501.home=(a)jboss501.home@
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
Deleted: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-
-<project default="main" basedir="." name="JBossWS-Metro">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${basedir}/output"/>
-
- <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
- <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
-
- <property name="jboss422.lib" value="${jboss422.home}/lib"/>
- <property name="jboss422.client" value="${jboss422.home}/client"/>
- <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
- <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
- <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
- <property name="jboss423.lib" value="${jboss423.home}/lib"/>
- <property name="jboss423.client" value="${jboss423.home}/client"/>
- <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
- <property name="jboss500.lib" value="${jboss500.home}/lib"/>
- <property name="jboss500.client" value="${jboss500.home}/client"/>
- <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
-
- <available property="jboss422.available" file="${jboss422.available.file}"/>
- <available property="jboss423.available" file="${jboss423.available.file}"/>
- <available property="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss501.available" file="${jboss501.available.file}"/>
-
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
- <condition property="jbossws.integration.jboss50" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </or>
- </condition>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
-
- <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </condition>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/mimepull.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/wsit-resolver.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xws-security.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-metro-client.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- dummy targets -->
- <target name="prepare-deploy" depends="prepare"/>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/distro/build-deploy.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml)
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml (rev 0)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro42" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss422">
+ <property name="jbossws.integration.target" value="jboss422"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss423">
+ <property name="jbossws.integration.target" value="jboss423"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro50" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss500">
+ <property name="jbossws.integration.target" value="jboss500"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss501">
+ <property name="jbossws.integration.target" value="jboss501"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Create jbossws-deploy.conf -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-create-deploy-conf">
+ <attribute name="deploystructure"/>
+ <sequential>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </sequential>
+ </macrodef>
+
+</project>
Copied: stack/metro/trunk/src/main/distro/build-setup.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml)
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml (rev 0)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+ <property file="${basedir}/ant.properties"/>
+
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
+
+ <property name="jboss423.lib" value="${jboss423.home}/lib"/>
+ <property name="jboss423.client" value="${jboss423.home}/client"/>
+ <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
+
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
+
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss423.available" file="${jboss423.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Load jbossws.integration.target properties -->
+ <property file="${target.properties.file}"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/distro/build.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml)
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml (rev 0)
+++ stack/metro/trunk/src/main/distro/build.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project basedir="." name="JBossWS-CXF">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="output.dir" value="${basedir}/output"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${output.dir}"/>
+
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
+
+ <import file="${build.dir}/build-setup.xml"/>
+ <import file="${build.dir}/build-deploy.xml"/>
+ <import file="${build.dir}/jbossws-deploy-macros.xml"/>
+ <import file="${tests.dir}/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare">
+
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
+
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+ <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ </target>
+
+ <target name="tests-init" depends="init,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <fileset dir="${thirdparty.dir}"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ <property name="jbossws.test.log" value="${tests.output.dir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- dummy targets -->
+ <target name="prepare-deploy" depends="init"/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/distro/jbossws-default-deploy.conf (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf)
===================================================================
--- stack/metro/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0)
+++ stack/metro/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Copied: stack/metro/trunk/src/main/distro/jbossws-deploy-macros.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml)
===================================================================
--- stack/metro/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0)
+++ stack/metro/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!--
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-metro-wsit-rt.jar"/>
+ <include name="**/jbossws-metro-wsit-tools.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/stax-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/FastInfoset.jar"/>
+ <include name="**/http.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jaxws-local-transport.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-metro-server.jar"/>
+ <include name="**/jbossws-metro-wsit-rt.jar"/>
+ <include name="**/jbossws-metro-wsit-tools.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/jsr173_api.jar"/>
+ <include name="**/jsr250-api.jar"/>
+ <include name="**/mimepull.jar"/>
+ <include name="**/resolver.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/sjsxp.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/stax-utils.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/txnannprocessor.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
+ <include name="**/xmldsig.jar"/>
+ <include name="**/xmlsec.jar"/>
+ <include name="**/xws-security.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/bin">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Server Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-sar42">
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true">
+ <fileset dir="@{artifactsdir}/lib">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{artifactsdir}/lib">
+ <include name="**/jbossws-metro-management.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-sar50">
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/lib">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{artifactsdir}/lib">
+ <include name="**/jbossws-metro-management.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/lib">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/scripts (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/scripts)
Deleted: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,85 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>binary-distribution</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <!-- root -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>build.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>ant.properties</include>
- </includes>
- </fileSet>
- <!-- build -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>build</outputDirectory>
- <includes>
- <include>build-deploy.xml</include>
- <include>build-setup.xml</include>
- <include>jbossws-default-deploy.conf</include>
- <include>jbossws-deploy-macros.xml</include>
- </includes>
- </fileSet>
- <!-- docs -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>docs</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>Install.txt</include>
- <include>ReleaseNotes.txt</include>
- <include>JBossORG-EULA.txt</include>
- </includes>
- </fileSet>
- <!-- deploy -->
- <fileSet>
- <directory>target/deploy-artifacts</directory>
- <outputDirectory>deploy</outputDirectory>
- </fileSet>
- <!-- test excludes -->
- <fileSet>
- <directory>modules/testsuite/cxf-tests/src/test</directory>
- <outputDirectory>tests</outputDirectory>
- <includes>
- <include>etc/**</include>
- <include>resources/test-excludes-*.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <!-- framework tests -->
- <dependencySets>
- <dependencySet>
- <outputDirectory>tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:testsuite</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>ant-import/**</include>
- <include>java/org/jboss/test/ws/jaxws/samples/**</include>
- <include>resources/jaxws/samples/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml)
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,85 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>binary-distribution</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- root -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>ant.properties</include>
+ </includes>
+ </fileSet>
+ <!-- build -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>build-deploy.xml</include>
+ <include>build-setup.xml</include>
+ <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-deploy-macros.xml</include>
+ </includes>
+ </fileSet>
+ <!-- docs -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>docs</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>Install.txt</include>
+ <include>ReleaseNotes.txt</include>
+ <include>JBossORG-EULA.txt</include>
+ </includes>
+ </fileSet>
+ <!-- deploy -->
+ <fileSet>
+ <directory>target/deploy-artifacts</directory>
+ <outputDirectory>deploy</outputDirectory>
+ </fileSet>
+ <!-- test excludes -->
+ <fileSet>
+ <directory>modules/testsuite/cxf-tests/src/test</directory>
+ <outputDirectory>tests</outputDirectory>
+ <includes>
+ <include>etc/**</include>
+ <include>resources/test-excludes-*.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <!-- framework tests -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:testsuite</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>resources/jaxws/samples/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Deleted: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,158 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>deploy-artifacts</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss422:jar:*</include>
- <include>*:jbossws-jboss423:jar:*</include>
- <include>*:jbossws-jboss500:jar:*</include>
- <include>*:jbossws-jboss501:jar:*</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <!-- lib -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-metro-client</include>
- <include>org.jboss.ws:jbossws-metro-server</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:FastInfoset:jar</include>
- <include>*:http:jar</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jaxb-impl:jar</include>
- <include>*:jaxb-xjc:jar</include>
- <include>*:jaxrpc-api:jar</include>
- <include>*:jaxws-api:jar</include>
- <include>*:jaxws-local-transport:jar</include>
- <include>*:jaxws-rt:jar</include>
- <include>*:jaxws-tools:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:jsr181-api:jar</include>
- <include>*:jsr173_api:jar</include>
- <include>*:jsr250-api:jar</include>
- <include>*:mimepull:jar</include>
- <include>*:resolver:jar</include>
- <include>*:saaj-api:jar</include>
- <include>*:saaj-impl:jar</include>
- <include>*:sjsxp:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:stax-ex:jar</include>
- <include>*:streambuffer:jar</include>
- <include>*:txnannprocessor:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xmldsig:jar</include>
- <include>*:xmlsec:jar</include>
- <include>*:xws-security:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:wstx-lgpl:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-metro-management</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- <!--
- Does not work with maven-2.0.9
- This should include the output from module wsit
- <moduleSet>
- <includes>
- <include>*:jbossws-metro-wsit:jar:*</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}-${module.classifier}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet-->
- </moduleSets>
-
- <!-- resources -->
- <fileSets>
- <fileSet>
- <directory>modules/server/target/resources</directory>
- <outputDirectory>resources</outputDirectory>
- <includes>
- <include>jbossws-*/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <!-- This should be a moduleSet - see above -->
- <files>
- <file>
- <outputDirectory>lib</outputDirectory>
- <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source>
- <destName>jbossws-metro-wsit-rt.jar</destName>
- </file>
- <file>
- <outputDirectory>lib</outputDirectory>
- <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source>
- <destName>jbossws-metro-wsit-tools.jar</destName>
- </file>
- </files>
-</assembly>
\ No newline at end of file
Copied: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6759, stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml)
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 20:32:37 UTC (rev 6760)
@@ -0,0 +1,158 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>deploy-artifacts</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+
+ <!-- bin -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+
+ <!-- lib -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss422:jar:*</include>
+ <include>*:jbossws-jboss423:jar:*</include>
+ <include>*:jbossws-jboss500:jar:*</include>
+ <include>*:jbossws-jboss501:jar:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <!-- lib -->
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-client</include>
+ <include>org.jboss.ws:jbossws-metro-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:FastInfoset:jar</include>
+ <include>*:http:jar</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxrpc-api:jar</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jaxws-local-transport:jar</include>
+ <include>*:jaxws-rt:jar</include>
+ <include>*:jaxws-tools:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:jsr181-api:jar</include>
+ <include>*:jsr173_api:jar</include>
+ <include>*:jsr250-api:jar</include>
+ <include>*:mimepull:jar</include>
+ <include>*:resolver:jar</include>
+ <include>*:saaj-api:jar</include>
+ <include>*:saaj-impl:jar</include>
+ <include>*:sjsxp:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:txnannprocessor:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:xmldsig:jar</include>
+ <include>*:xmlsec:jar</include>
+ <include>*:xws-security:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx-lgpl:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <!--
+ Does not work with maven-2.0.9
+ This should include the output from module wsit
+ <moduleSet>
+ <includes>
+ <include>*:jbossws-metro-wsit:jar:*</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}-${module.classifier}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet-->
+ </moduleSets>
+
+ <!-- resources -->
+ <fileSets>
+ <fileSet>
+ <directory>modules/server/target/resources</directory>
+ <outputDirectory>resources</outputDirectory>
+ <includes>
+ <include>jbossws-*/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <!-- This should be a moduleSet - see above -->
+ <files>
+ <file>
+ <outputDirectory>lib</outputDirectory>
+ <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source>
+ <destName>jbossws-metro-wsit-rt.jar</destName>
+ </file>
+ <file>
+ <outputDirectory>lib</outputDirectory>
+ <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source>
+ <destName>jbossws-metro-wsit-tools.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Deleted: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-04-29 20:23:28 UTC (rev 6759)
+++ stack/metro/trunk/version.properties 2008-04-29 20:32:37 UTC (rev 6760)
@@ -1,47 +0,0 @@
-
-# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=metro-3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Sun Metro
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Dependend integration projects
-jbossws-spi=3.0.0-SNAPSHOT
-jbossws-common=3.0.0-SNAPSHOT
-jbossws-framework=3.0.2-SNAPSHOT
-
-jbossws-jboss422=3.0.0-SNAPSHOT
-jbossws-jboss423=3.0.0-SNAPSHOT
-jbossws-jboss500=3.0.0-SNAPSHOT
-jbossws-jboss501=3.0.0-SNAPSHOT
-
-junit=3.8.1
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
-jboss-jaxr=1.2.0.GA
-jboss-security-spi=2.0.0.Beta
-sun-fi=1.2.2
-sun-jaf=1.1
-sun-jaxb=2.1.6
-sun-jaxrpc=1.1
-sun-jaxws=2.1.3
-sun-servlet=2.5
-stax-api=1.0
-ibm-wsdl4j=1.6.2
-woodstox=3.1.1
-
-xml-commons=1.2
-xml-sec=1.3
-sun-javamail=1.4
-
-# metro cvs
-metro.cvs.tag=metro1_1-release
17 years, 8 months
JBossWS SVN: r6759 - stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 16:23:28 -0400 (Tue, 29 Apr 2008)
New Revision: 6759
Modified:
stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/
Log:
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
+ src
target
17 years, 8 months
JBossWS SVN: r6758 - in stack/metro/branches/tdiesler/trunk: modules/testsuite/framework-tests and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 16:22:31 -0400 (Tue, 29 Apr 2008)
New Revision: 6758
Modified:
stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/
stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
Log:
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-29 20:22:31 UTC (rev 6758)
@@ -89,100 +89,91 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
- <!-- EJB3/Injection excludes -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <!-- [JBWS-2163] wsconsume for maven build -->
<exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
<exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <!-- [JBWS-1683] Fix JAXR samples for CXF -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
- <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+ <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <!-- [CXF-1244] Application Exception not initialized properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
- <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
- <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
- <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
-
- <!-- [CXF-1510] Cannot handle anonymous bare requests -->
- <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
-
- <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
<exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
<exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
- <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <!-- [JBWS-2129] Wrapper class is not found -->
<exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
- <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <!-- [JBWS-2013] Implement standard messge context properties -->
<exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
- <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
-
- <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
-
- <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
-
- <!-- [CXF-1517] HTTP bindings for Provider -->
<exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
- <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
- <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
- <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
- <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [CXF-1520] MTOM chunked encoding transfer -->
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
-
- <!-- [CXF-1521] Exception handling with @WebFault annotation -->
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [CXF-1522] NPE in ServiceUtils -->
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -202,100 +193,98 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
- <!-- EJB3/Injection excludes -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <!-- [JBWS-2163] wsconsume for maven build -->
<exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
<exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <!-- [JBWS-1683] Fix JAXR samples for CXF -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
- <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+ <!-- [JBWS-1674] Fix @WebServiceRef with Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <!-- [CXF-1244] Application Exception not initialized properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
- <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
- <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
- <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
-
- <!-- [CXF-1510] Cannot handle anonymous bare requests -->
- <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
-
- <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
<exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
<exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
- <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <!-- [JBWS-2129] Wrapper class is not found -->
<exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
- <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <!-- [JBWS-2013] Implement standard messge context properties -->
<exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
- <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
-
- <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
-
- <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
-
- <!-- [CXF-1517] HTTP bindings for Provider -->
<exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
- <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
- <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
- <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
- <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [CXF-1520] MTOM chunked encoding transfer -->
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
- <!-- [CXF-1521] Exception handling with @WebFault annotation -->
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
- <!-- [CXF-1522] NPE in ServiceUtils -->
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -319,105 +308,100 @@
http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
- <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <!-- [JBWS-2163] wsconsume for maven build -->
<exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
<exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <!-- [JBWS-1683] Fix JAXR samples for CXF -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
<!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!-- [CXF-1244] Application Exception not initialized properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
- <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
- <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
- <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
-
<!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
- <!-- [CXF-1510] Cannot handle anonymous bare requests -->
- <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
- <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
<exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
<exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
- <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <!-- [JBWS-2129] Wrapper class is not found -->
<exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
- <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <!-- [JBWS-2013] Implement standard messge context properties -->
<exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
- <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
-
- <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
-
- <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
-
- <!-- [CXF-1517] HTTP bindings for Provider -->
<exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
- <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
- <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
- <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
- <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [CXF-1520] MTOM chunked encoding transfer -->
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <!-- [JBWS-2137] @WebWservice does not work with class isolation -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
- <!-- [CXF-1521] Exception handling with @WebFault annotation -->
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
- <!-- [CXF-1522] NPE in ServiceUtils -->
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
- <!-- [JBWS-2120] @WebWservice does not work with class isolation -->
- <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
-
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -437,125 +421,119 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!--
- Exlude tests via an external exlude file
- http://jira.codehaus.org/browse/SUREFIRE-486
+ Exlude tests via an external exlude file
+ http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
+ <!-- [JBWS-2165] Fix xop tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/**</exclude>
- <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
- <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
- <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
-
- <!-- [JBWS-1774] Provide tools implementation for CXF -->
+ <!-- [JBWS-2163] wsconsume for maven build -->
<exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
<exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
- <!-- [JBWS-1683] Fix JAXR samples for CXF -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
- <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -->
- <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
-
<!-- [EJBTHREE-1150] WebServiceContext injection requires mapped-name -->
<exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude>
<!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*</exclude>
- <!-- [CXF-1244] Application Exception not initialized properly -->
- <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+ <!-- [JBWS-1178] Multiple virtual host and soap:address problem -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude>
- <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -->
- <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude>
+ <!-- [JBWS-1673] Fix JAXR samples for Metro -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI -->
- <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude>
-
<!-- TODO: Fix classpath to ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
<!-- [JBWS-2107] Resolve dependency on @SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude>
- <!-- [CXF-1510] Cannot handle anonymous bare requests -->
- <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
- <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -->
+ <!-- [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -->
<exclude>org/jboss/test/ws/jaxws/binding/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [JBWS-2112] Cannot use CXF with endpoint API -->
+ <!-- [JBWS-2128] DefaultHttpContext is not a supported context. -->
<exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude>
- <!-- [CXF-1513] NPE in JaxWsServiceConfiguration -->
+ <!-- [JBWS-2129] Wrapper class is not found -->
<exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1357/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1529/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws860/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
- <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -->
+ <!-- [JBWS-2013] Implement standard messge context properties -->
<exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude>
- <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class -->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
-
- <!-- [CXF-1515] Bad Enumeration value 'extension restriction' -->
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
-
- <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated -->
+ <!-- [JBWS-2130] WebServiceException: null is not a valid service -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
- <!-- [CXF-1516] Type inheritance with document/literal/wrapped -->
+ <!-- [JBWS-2131] WebServiceException: Failed to build METRO runtime model -->
<exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude>
-
- <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -->
- <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude>
-
- <!-- [CXF-1517] HTTP bindings for Provider -->
<exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude>
- <!-- [JBWS-2118] context-root in jboss.xml is ignored -->
+ <!-- [JBWS-2132] IllegalArgumentException: protocol = http host = null -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1798/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1843/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2009/**</exclude>
+
+ <!-- [JBWS-2133] Failed to access the WSDL -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
- <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider -->
+ <!-- [JBWS-2134] Fault string, and possibly fault code, not set -->
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
- <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- [JBWS-2135] WebServiceException: Undefined port type -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
- <!-- [CXF-1519] Explicitly set the namespace of a WebFault -->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!-- [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl -->
+ <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude>
- <!-- [CXF-1520] MTOM chunked encoding transfer -->
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
-
- <!-- [CXF-1521] Exception handling with @WebFault annotation -->
- <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude>
-
- <!-- [CXF-1522] NPE in ServiceUtils -->
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
-
<!-- [JBAS-5359] mapped-name is required for context of deployment -->
- <exclude>org/jboss/test/ws/console/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude>
- <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
- <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude>
-
- <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory - ->
+ <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory -->
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude-->
+ <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude>
+
+ <!-- [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*</exclude>
+
+ <!-- UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*</exclude>
+
+ <!-- [JBWS-2029] Make the project generator available for all stacks -->
+ <exclude>org/jboss/test/ws/projectGenerator/**</exclude>
</testExcludes>
</configuration>
</plugin>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests
___________________________________________________________________
Name: svn:ignore
+ target
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 20:22:31 UTC (rev 6758)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack CXF Testsuite</name>
+ <name>JBoss Web Services - Stack Metro Testsuite</name>
<artifactId>jbossws-metro-testsuite</artifactId>
<packaging>pom</packaging>
Modified: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 19:56:39 UTC (rev 6757)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 20:22:31 UTC (rev 6758)
@@ -81,6 +81,7 @@
<include name="**/jaxws-local-transport.jar"/>
<include name="**/jaxws-rt.jar"/>
<include name="**/jaxws-tools.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
<include name="**/jbossws-metro-server.jar"/>
<include name="**/jbossws-metro-wsit-rt.jar"/>
<include name="**/jbossws-metro-wsit-tools.jar"/>
17 years, 8 months
JBossWS SVN: r6757 - in stack/metro/branches/tdiesler/trunk: modules/client and 9 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-29 15:56:39 -0400 (Tue, 29 Apr 2008)
New Revision: 6757
Added:
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
Modified:
stack/metro/branches/tdiesler/trunk/.classpath
stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/metro/branches/tdiesler/trunk/pom.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
metro tests ok
Modified: stack/metro/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/.classpath 2008-04-29 19:56:39 UTC (rev 6757)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="modules/testsuite/metro-tests/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 kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: stack/metro/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -64,6 +64,10 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>txnannprocessor</artifactId>
</dependency>
<dependency>
Modified: stack/metro/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -85,6 +85,10 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>txnannprocessor</artifactId>
</dependency>
<dependency>
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -54,6 +54,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -75,6 +83,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -96,6 +112,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
@@ -117,6 +141,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+
+ <!-- [JBWS-2158] Metro doesn't read keystore/trustore provided in the client and server jars -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/**</exclude>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/wsit/rm/**</exclude>
</testExcludes>
</configuration>
</plugin>
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ============================================================================== -->
+ <!-- Building -->
+ <!-- -->
+ <!-- Where to create your tests -->
+ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
+ <!-- -->
+ <!-- ============================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jbws1869 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/>
+ </classes>
+ </war>
+
+ <!-- jbws1871 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/>
+ </classes>
+ </war>
+
+ <!-- wsit-rm -->
+ <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/Add.class"/>
+ <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF">
+ <include name="sun-web.xml"/>
+ <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
+ </webinf>
+ </war>
+
+ </target>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="client-*.jks"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-sign-encrypt -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="server-*.jks"/>
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="client-*.jks"/>
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsse-username -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF">
+ <include name="wsit-*.xml"/>
+ </webinf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
+ <include name="services/**"/>
+ </metainf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF">
+ <include name="wsit-client.xml"/>
+ </metainf>
+ </jar>
+
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/jndi.properties 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -56,33 +56,12 @@
<priority value="DEBUG"/>
</category>
- <category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <!-- Apache security is verbose -->
- <category name="org.apache.xml.security">
- <priority value="INFO"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
<root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
+ <!--appender-ref ref="CONSOLE"/-->
<appender-ref ref="FILE"/>
</root>
Added: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy (rev 0)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/etc/tst.policy 2008-04-29 19:56:39 UTC (rev 6757)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -78,4 +78,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -84,4 +84,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/metro-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-29 19:56:39 UTC (rev 6757)
@@ -99,3 +99,5 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+# [JBWS-2029] Make the project generator available for all stacks
+org/jboss/test/ws/projectGenerator/**
Modified: stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -50,8 +50,8 @@
<artifactId>ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
Modified: stack/metro/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/pom.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -209,6 +209,11 @@
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
+ <artifactId>resolver</artifactId>
+ <version>${sun.wsit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.wsit</groupId>
<artifactId>wsit-rt</artifactId>
<version>${sun.wsit.version}</version>
</dependency>
Modified: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -88,6 +88,7 @@
<include name="**/jsr173_api.jar"/>
<include name="**/jsr250-api.jar"/>
<include name="**/mimepull.jar"/>
+ <include name="**/resolver.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
<include name="**/sjsxp.jar"/>
@@ -96,7 +97,6 @@
<include name="**/streambuffer.jar"/>
<include name="**/txnannprocessor.jar"/>
<include name="**/wsdl4j.jar"/>
- <include name="**/wsit-resolver.jar"/>
<include name="**/wstx.jar"/>
<include name="**/xmldsig.jar"/>
<include name="**/xmlsec.jar"/>
Modified: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 18:56:16 UTC (rev 6756)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 19:56:39 UTC (rev 6757)
@@ -80,6 +80,7 @@
<include>*:jsr173_api:jar</include>
<include>*:jsr250-api:jar</include>
<include>*:mimepull:jar</include>
+ <include>*:resolver:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
<include>*:sjsxp:jar</include>
17 years, 8 months