JBossWS SVN: r10555 - spi/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 16:29:42 -0400 (Mon, 17 Aug 2009)
New Revision: 10555
Modified:
spi/trunk/pom.xml
Log:
[JBWS-2675] reviewed SPI dependencies
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2009-08-17 14:48:14 UTC (rev 10554)
+++ spi/trunk/pom.xml 2009-08-17 20:29:42 UTC (rev 10555)
@@ -1,104 +1,73 @@
<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 - SPI</name>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<packaging>jar</packaging>
-
+
<version>1.2.0-SNAPSHOT</version>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
<version>1.0.2.GA</version>
</parent>
-
+
<!-- Source Control Management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/trunk</developerConnection>
<url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
</scm>
-
+
<!-- Properties -->
<properties>
+ <ant.version>1.7.1</ant.version>
<dom4j.version>1.6.1</dom4j.version>
<getopt.version>1.0.13</getopt.version>
- <jboss.common.version>1.2.1.GA</jboss.common.version>
- <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
- <jbossxb.version>1.0.0.SP1</jbossxb.version>
+ <sun.jaxb.version>2.1.9</sun.jaxb.version>
+ <jaxws.api.version>2.1</jaxws.api.version>
+ <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version>
+ <jboss.web.version>2.1.3.GA</jboss.web.version>
+ <junit.version>3.8.2</junit.version>
</properties>
-
+
<!-- Dependencies -->
<dependencies>
-
+
<!-- provided apis -->
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${jboss.web.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <version>${sun.jaxb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.1</version>
+ <version>${jaxws.api.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- jboss provided -->
<dependency>
- <groupId>jboss.common</groupId>
- <artifactId>jboss-common</artifactId>
- <version>${jboss.common.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
+ <artifactId>jboss-kernel</artifactId>
<version>${jboss.microcontainer.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${jbossxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jboss.common.core</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.logging.log4j</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- <scope>provided</scope>
- </dependency>
-
+
<!-- transitive dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -110,16 +79,16 @@
<artifactId>getopt</artifactId>
<version>${getopt.version}</version>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<resources>
@@ -159,5 +128,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
14 years, 10 months
JBossWS SVN: r10554 - in stack/native/trunk/modules: testsuite and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 10:48:14 -0400 (Mon, 17 Aug 2009)
New Revision: 10554
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2587] don't eat exception fix + disabling test
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2009-08-17 14:48:14 UTC (rev 10554)
@@ -107,7 +107,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException("Decryption was invalid.");
+ throw new FailedCheckException("Decryption was invalid.", e);
}
catch (Exception e)
{
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 14:48:14 UTC (rev 10554)
@@ -15,3 +15,7 @@
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+
+# [JBWS-2587] Investigate why SimpleDispatchTestCase is failing
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 14:48:14 UTC (rev 10554)
@@ -9,3 +9,7 @@
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+
+# [JBWS-2587] Investigate why SimpleDispatchTestCase is failing
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 14:48:14 UTC (rev 10554)
@@ -9,3 +9,7 @@
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+
+# [JBWS-2587] Investigate why SimpleDispatchTestCase is failing
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 14:48:14 UTC (rev 10554)
@@ -9,3 +9,7 @@
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+
+# [JBWS-2587] Investigate why SimpleDispatchTestCase is failing
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:29:46 UTC (rev 10553)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 14:48:14 UTC (rev 10554)
@@ -9,3 +9,7 @@
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
+
+# [JBWS-2587] Investigate why SimpleDispatchTestCase is failing
+org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.*
+
14 years, 10 months
JBossWS SVN: r10553 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 07:29:46 -0400 (Mon, 17 Aug 2009)
New Revision: 10553
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2630] enabling tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:28:11 UTC (rev 10552)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:29:46 UTC (rev 10553)
@@ -44,6 +44,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:28:11 UTC (rev 10552)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:29:46 UTC (rev 10553)
@@ -44,6 +44,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:28:11 UTC (rev 10552)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:29:46 UTC (rev 10553)
@@ -44,6 +44,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:28:11 UTC (rev 10552)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:29:46 UTC (rev 10553)
@@ -50,6 +50,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:28:11 UTC (rev 10552)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:29:46 UTC (rev 10553)
@@ -44,6 +44,3 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
14 years, 10 months
JBossWS SVN: r10552 - stack/metro/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 07:28:11 -0400 (Mon, 17 Aug 2009)
New Revision: 10552
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2630] enabling tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:26:40 UTC (rev 10551)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:28:11 UTC (rev 10552)
@@ -48,6 +48,3 @@
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:26:40 UTC (rev 10551)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:28:11 UTC (rev 10552)
@@ -45,6 +45,3 @@
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:26:40 UTC (rev 10551)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:28:11 UTC (rev 10552)
@@ -45,6 +45,3 @@
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:26:40 UTC (rev 10551)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:28:11 UTC (rev 10552)
@@ -45,6 +45,3 @@
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:26:40 UTC (rev 10551)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:28:11 UTC (rev 10552)
@@ -45,6 +45,3 @@
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
14 years, 10 months
JBossWS SVN: r10551 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 07:26:40 -0400 (Mon, 17 Aug 2009)
New Revision: 10551
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2630] enabling tests
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:13:28 UTC (rev 10550)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-08-17 11:26:40 UTC (rev 10551)
@@ -10,9 +10,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
-
# [JBWS-2634] Implement support for @EJB annotations in WS components (fixed in AS 501 and above)
org/jboss/test/ws/jaxws/jbws2634/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:13:28 UTC (rev 10550)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-08-17 11:26:40 UTC (rev 10551)
@@ -7,8 +7,5 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
-
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:13:28 UTC (rev 10550)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-08-17 11:26:40 UTC (rev 10551)
@@ -7,8 +7,5 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
-
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:13:28 UTC (rev 10550)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-08-17 11:26:40 UTC (rev 10551)
@@ -7,8 +7,5 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
-
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:13:28 UTC (rev 10550)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-08-17 11:26:40 UTC (rev 10551)
@@ -7,8 +7,5 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2630] Wrong context when deploying endpoint in war embedded in a jar
-org/jboss/test/ws/jaxws/jbws2630/**
-
# [JBWS-2674] Implement javax.xml.ws.Endpoint
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
14 years, 10 months
JBossWS SVN: r10550 - in container/jboss50/branches: jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 07:13:28 -0400 (Mon, 17 Aug 2009)
New Revision: 10550
Modified:
container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
Log:
[JBWS-2630] fixing issue
Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
jbossWebMD.setSecurityDomain(securityDomain);
}
- // Set context root
- final String contextRoot = dep.getService().getContextRoot();
- this.log.debug("Setting context root: " + contextRoot);
- jbossWebMD.setContextRoot(contextRoot);
-
// Set virtual hosts
final List<String> virtualHosts = dep.getService().getVirtualHosts();
this.log.debug("Setting virtual hosts: " + virtualHosts);
Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
this.propagateContextProps(dep, jbossWebMD);
this.configureEndpoints(dep, jbossWebMD);
+ this.modifyContextRoot(dep, jbossWebMD);
}
/**
@@ -128,6 +129,19 @@
}
/**
+ * Modifies context root.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String contextRoot = dep.getService().getContextRoot();
+ this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+ jbossWebMD.setContextRoot(contextRoot);
+ }
+
+ /**
* Returns stack specific transport class name.
*
* @param dep webservice deployment
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
jbossWebMD.setSecurityDomain(securityDomain);
}
- // Set context root
- final String contextRoot = dep.getService().getContextRoot();
- this.log.debug("Setting context root: " + contextRoot);
- jbossWebMD.setContextRoot(contextRoot);
-
// Set virtual hosts
final List<String> virtualHosts = dep.getService().getVirtualHosts();
this.log.debug("Setting virtual hosts: " + virtualHosts);
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
this.propagateContextProps(dep, jbossWebMD);
this.configureEndpoints(dep, jbossWebMD);
+ this.modifyContextRoot(dep, jbossWebMD);
}
/**
@@ -128,6 +129,19 @@
}
/**
+ * Modifies context root.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String contextRoot = dep.getService().getContextRoot();
+ this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+ jbossWebMD.setContextRoot(contextRoot);
+ }
+
+ /**
* Returns stack specific transport class name.
*
* @param dep webservice deployment
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -129,11 +129,6 @@
jbossWebMD.setSecurityDomain(securityDomain);
}
- // Set context root
- final String contextRoot = dep.getService().getContextRoot();
- this.log.debug("Setting context root: " + contextRoot);
- jbossWebMD.setContextRoot(contextRoot);
-
// Set virtual hosts
final List<String> virtualHosts = dep.getService().getVirtualHosts();
this.log.debug("Setting virtual hosts: " + virtualHosts);
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 09:32:19 UTC (rev 10549)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-17 11:13:28 UTC (rev 10550)
@@ -67,6 +67,7 @@
this.propagateContextProps(dep, jbossWebMD);
this.configureEndpoints(dep, jbossWebMD);
+ this.modifyContextRoot(dep, jbossWebMD);
}
/**
@@ -128,6 +129,19 @@
}
/**
+ * Modifies context root.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void modifyContextRoot(final Deployment dep, final JBossWebMetaData jbossWebMD)
+ {
+ final String contextRoot = dep.getService().getContextRoot();
+ this.log.debug("Setting context root: " + contextRoot + " for deployment: " + dep.getSimpleName());
+ jbossWebMD.setContextRoot(contextRoot);
+ }
+
+ /**
* Returns stack specific transport class name.
*
* @param dep webservice deployment
14 years, 10 months
JBossWS SVN: r10549 - container/jboss50/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 05:32:19 -0400 (Mon, 17 Aug 2009)
New Revision: 10549
Removed:
container/jboss50/branches/ropalka-jboss510/
Log:
removing obsolete branch
14 years, 10 months
JBossWS SVN: r10548 - framework/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 05:29:38 -0400 (Mon, 17 Aug 2009)
New Revision: 10548
Removed:
framework/branches/ropalka/
Log:
removing obsolete working branch
14 years, 10 months
JBossWS SVN: r10547 - common/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-17 05:29:23 -0400 (Mon, 17 Aug 2009)
New Revision: 10547
Removed:
common/branches/ropalka/
Log:
removing obsolete working branch
14 years, 10 months