JBossWS SVN: r10409 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 06:36:03 -0400 (Wed, 29 Jul 2009)
New Revision: 10409
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
svn merge -r 10405:10407 https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-native-3.1.... .
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-07-29 10:36:03 UTC (rev 10409)
@@ -49,7 +49,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-29 10:36:03 UTC (rev 10409)
@@ -149,10 +149,6 @@
<artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
- <artifactId>policy</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
</dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 10:36:03 UTC (rev 10409)
@@ -44,7 +44,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Execute the command
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 10:36:03 UTC (rev 10409)
@@ -78,7 +78,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
###
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 10:36:03 UTC (rev 10409)
@@ -53,7 +53,6 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 10:36:03 UTC (rev 10409)
@@ -80,7 +80,6 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 10:36:03 UTC (rev 10409)
@@ -44,7 +44,6 @@
<include name="**/jbossws-native-saaj.jar"/>
<include name="**/jbossws-spi.jar"/>
<include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/stax-ex.jar"/>
<include name="**/streambuffer.jar"/>
@@ -78,7 +77,6 @@
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-native-core.jar"/>
<include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/xmlsec.jar"/>
</patternset>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-29 10:36:03 UTC (rev 10409)
@@ -71,7 +71,6 @@
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.2.6</woodstox.version>
- <wscommons.policy.version>1.0</wscommons.policy.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<xmlsec.version>1.4.2</xmlsec.version>
<xalan.version>2.7.0</xalan.version>
@@ -256,11 +255,6 @@
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
- <artifactId>policy</artifactId>
- <version>${wscommons.policy.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
<version>${woodstox.version}</version>
14 years, 9 months
- 1
- 0
JBossWS SVN: r10408 - in stack/native/tags/jbossws-native-3.1.2.SP3: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 05:45:18 -0400 (Wed, 29 Jul 2009)
New Revision: 10408
Modified:
stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxrpc/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws-ext/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/management/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/saaj/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml
Log:
[JBPAPP-2094] Modifying poms for jbossws-native-3.1.2.SP3
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxrpc/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxrpc/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws-ext/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/jaxws-ext/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/management/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/management/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/saaj/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/saaj/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/saaj/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/framework-tests/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml 2009-07-29 09:23:03 UTC (rev 10407)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml 2009-07-29 09:45:18 UTC (rev 10408)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2.SP2</version>
+ <version>3.1.2.SP3</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
14 years, 9 months
- 1
- 0
JBossWS SVN: r10407 - stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 05:23:03 -0400 (Wed, 29 Jul 2009)
New Revision: 10407
Removed:
stack/native/tags/jbossws-native-3.1.2.SP3/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/
Log:
Removing useless test
14 years, 9 months
- 1
- 0
JBossWS SVN: r10406 - in stack/native/tags/jbossws-native-3.1.2.SP3: modules/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 04:46:21 -0400 (Wed, 29 Jul 2009)
New Revision: 10406
Modified:
stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.bat
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.sh
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP3/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Remove dependency on policy artifact
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/client/pom.xml 2009-07-29 08:46:21 UTC (rev 10406)
@@ -49,7 +49,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/core/pom.xml 2009-07-29 08:46:21 UTC (rev 10406)
@@ -149,10 +149,6 @@
<artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
- <artifactId>policy</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
</dependency>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 08:46:21 UTC (rev 10406)
@@ -44,7 +44,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Execute the command
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 08:46:21 UTC (rev 10406)
@@ -78,7 +78,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
###
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 08:46:21 UTC (rev 10406)
@@ -53,7 +53,6 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 08:46:21 UTC (rev 10406)
@@ -80,7 +80,6 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 08:46:21 UTC (rev 10406)
@@ -44,7 +44,6 @@
<include name="**/jbossws-native-saaj.jar"/>
<include name="**/jbossws-spi.jar"/>
<include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/stax-ex.jar"/>
<include name="**/streambuffer.jar"/>
@@ -78,7 +77,6 @@
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-native-core.jar"/>
<include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/xmlsec.jar"/>
</patternset>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/pom.xml 2009-07-29 08:46:21 UTC (rev 10406)
@@ -71,7 +71,6 @@
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.2.6</woodstox.version>
- <wscommons.policy.version>1.0</wscommons.policy.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<xmlsec.version>1.4.2</xmlsec.version>
<xalan.version>2.7.0</xalan.version>
@@ -256,11 +255,6 @@
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
- <artifactId>policy</artifactId>
- <version>${wscommons.policy.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-lgpl</artifactId>
<version>${woodstox.version}</version>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-29 08:23:51 UTC (rev 10405)
+++ stack/native/tags/jbossws-native-3.1.2.SP3/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-29 08:46:21 UTC (rev 10406)
@@ -46,7 +46,6 @@
<include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include>
<include>org.jboss.ws.native:jbossws-native-saaj:jar</include>
<include>org.codehaus.jettison:jettison:jar</include>
- <include>wscommons-policy:policy:jar</include>
<include>stax:stax-api:jar</include>
<include>org.jvnet.staxex:stax-ex:jar</include>
<include>com.sun.xml.stream.buffer:streambuffer:jar</include>
14 years, 9 months
- 1
- 0
JBossWS SVN: r10405 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 04:23:51 -0400 (Wed, 29 Jul 2009)
New Revision: 10405
Added:
stack/native/tags/jbossws-native-3.1.2.SP3/
Log:
Copying 3.1.2.SP2 tag for preparing SP3
Copied: stack/native/tags/jbossws-native-3.1.2.SP3 (from rev 10404, stack/native/tags/jbossws-native-3.1.2.SP2)
14 years, 9 months
- 1
- 0
JBossWS SVN: r10404 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 04:03:08 -0400 (Wed, 29 Jul 2009)
New Revision: 10404
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandler.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/jse/
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2332] refactoring
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandler.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandler.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandler.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * Handle web app security meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public interface SecurityHandler
+{
+ /** Add the security domain to jboss-web.xml */
+ void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep);
+
+ /** Add the security roles to web.xml */
+ void addSecurityRoles(JBossWebMetaData webApp, Deployment dep);
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB21.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB21.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+
+/**
+ * Handle web app security meta data for EJB21
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class SecurityHandlerEJB21 implements SecurityHandler
+{
+ public void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep)
+ {
+ EJBArchiveMetaData ejbMetaData = WSHelper.getRequiredAttachment( dep, EJBArchiveMetaData.class );
+
+ String securityDomain = ejbMetaData.getSecurityDomain();
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.setSecurityDomain(securityDomain);
+ }
+ }
+
+ public void addSecurityRoles(JBossWebMetaData webApp, Deployment dep)
+ {
+ JBossMetaData jbmd = WSHelper.getRequiredAttachment( dep, JBossMetaData.class );
+ IAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor();
+ if (assemblyDescriptor != null)
+ {
+ SecurityRolesMetaData securityRoles = assemblyDescriptor.getSecurityRoles();
+ if (securityRoles != null)
+ webApp.setSecurityRoles(securityRoles);
+ }
+ }
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB3.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityHandlerEJB3.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+
+import javax.annotation.security.RolesAllowed;
+import java.util.Iterator;
+
+/**
+ * Handle web app security meta data for EJB3
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class SecurityHandlerEJB3 implements SecurityHandler
+{
+ public void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep)
+ {
+ WebServiceDeployment webServiceDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
+ String securityDomain = null;
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
+
+ while (it.hasNext())
+ {
+ WebServiceDeclaration container = it.next();
+ SecurityDomain anSecurityDomain = container.getAnnotation(SecurityDomain.class);
+ if (anSecurityDomain != null)
+ {
+ if (securityDomain != null && !securityDomain.equals(anSecurityDomain.value()))
+ throw new IllegalStateException("Multiple security domains not supported");
+
+ securityDomain = anSecurityDomain.value();
+ }
+ }
+
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.setSecurityDomain(securityDomain);
+ }
+ }
+
+ public void addSecurityRoles(JBossWebMetaData webApp, Deployment dep)
+ {
+ WebServiceDeployment webServiceDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
+
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
+ while (it.hasNext())
+ {
+ WebServiceDeclaration container = it.next();
+ RolesAllowed anRolesAllowed = container.getAnnotation(RolesAllowed.class);
+ if (anRolesAllowed != null)
+ {
+ SecurityRolesMetaData securityRoles = webApp.getSecurityRoles();
+ for (String roleName : anRolesAllowed.value())
+ {
+ SecurityRoleMetaData role = new SecurityRoleMetaData();
+ role.setRoleName(roleName);
+ securityRoles.add(role);
+ }
+ }
+ }
+ }
+
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,285 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.TransportGuaranteeType;
+import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.annotation.WebContext;
+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.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+
+/**
+ * A deployment aspect that generates a webapp for an EJB endpoint
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class WebAppGeneratorDeploymentAspect extends DeploymentAspect
+{
+ private SecurityHandler securityHandlerEJB21;
+ private SecurityHandler securityHandlerEJB3;
+
+ public void setSecurityHandlerEJB21(SecurityHandler handler)
+ {
+ this.securityHandlerEJB21 = handler;
+ }
+
+ public void setSecurityHandlerEJB3(SecurityHandler handler)
+ {
+ this.securityHandlerEJB3 = handler;
+ }
+
+ @Override
+ public void start(Deployment dep)
+ {
+ final DeploymentUnit unit = WSHelper.getRequiredAttachment( dep, DeploymentUnit.class );
+
+ if ( WSHelper.isJaxrpcEjbDeployment( dep ) )
+ {
+ JBossWebMetaData jbwmd = generateWebDeployment(dep, securityHandlerEJB21);
+ dep.addAttachment(JBossWebMetaData.class, jbwmd);
+ unit.addAttachment(JBossWebMetaData.class, jbwmd);
+ }
+ else if ( WSHelper.isJaxwsEjbDeployment( dep ) )
+ {
+ JBossWebMetaData jbwmd = generateWebDeployment(dep, securityHandlerEJB3);
+ dep.addAttachment(JBossWebMetaData.class, jbwmd);
+ unit.addAttachment(JBossWebMetaData.class, jbwmd);
+ }
+ }
+
+ protected JBossWebMetaData generateWebDeployment(Deployment dep, SecurityHandler securityHandler)
+ {
+ JBossWebMetaData jbwmd = new JBossWebMetaData();
+ createWebAppDescriptor(dep, jbwmd, securityHandler);
+ createJBossWebAppDescriptor(dep, jbwmd, securityHandler);
+ return jbwmd;
+ }
+
+ protected void createWebAppDescriptor(Deployment dep, JBossWebMetaData jbwmd, SecurityHandler securityHandler)
+ {
+ /*
+ <servlet>
+ <servlet-name>
+ <servlet-class>
+ </servlet>
+ */
+ JBossServletsMetaData servlets = jbwmd.getServlets();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ JBossServletMetaData servlet = new JBossServletMetaData();
+ servlet.setServletName(ep.getShortName());
+ servlet.setServletClass(ep.getTargetBeanName());
+ servlets.add(servlet);
+ }
+
+ /*
+ <servlet-mapping>
+ <servlet-name>
+ <url-pattern>
+ </servlet-mapping>
+ */
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
+ if (servletMappings == null)
+ {
+ servletMappings = new ArrayList<ServletMappingMetaData>();
+ jbwmd.setServletMappings(servletMappings);
+ }
+ ServletMappingMetaData servletMapping = new ServletMappingMetaData();
+ servletMapping.setServletName(ep.getShortName());
+ servletMapping.setUrlPatterns(Arrays.asList(new String[] { ep.getURLPattern() }));
+ servletMappings.add(servletMapping);
+ }
+
+ String authMethod = null;
+
+ // Add web-app/security-constraint for each port component
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ String ejbName = ep.getShortName();
+
+ Boolean secureWSDLAccess = null;
+ String transportGuarantee = null;
+ String beanAuthMethod = null;
+
+ WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class);
+ if (anWebContext != null)
+ {
+ if (anWebContext.authMethod().length() > 0)
+ beanAuthMethod = anWebContext.authMethod();
+ if (anWebContext.transportGuarantee().length() > 0)
+ transportGuarantee = anWebContext.transportGuarantee();
+ if (anWebContext.secureWSDLAccess())
+ secureWSDLAccess = anWebContext.secureWSDLAccess();
+ }
+
+ EJBArchiveMetaData appMetaData = WSHelper.getOptionalAttachment( dep, EJBArchiveMetaData.class );
+ if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null)
+ {
+ EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName);
+ EJBSecurityMetaData smd = bmd.getSecurityMetaData();
+ if (smd != null)
+ {
+ beanAuthMethod = smd.getAuthMethod();
+ transportGuarantee = smd.getTransportGuarantee();
+ secureWSDLAccess = smd.getSecureWSDLAccess();
+ }
+ }
+
+ if (beanAuthMethod != null || transportGuarantee != null)
+ {
+ /*
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>TestUnAuthPort</web-resource-name>
+ <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ */
+ List<SecurityConstraintMetaData> securityContraints = jbwmd.getSecurityContraints();
+ if (securityContraints == null)
+ {
+ securityContraints = new ArrayList<SecurityConstraintMetaData>();
+ jbwmd.setSecurityContraints(securityContraints);
+ }
+ SecurityConstraintMetaData securityConstraint = new SecurityConstraintMetaData();
+ securityContraints.add(securityConstraint);
+
+ WebResourceCollectionsMetaData resourceCollections = securityConstraint.getResourceCollections();
+ if (resourceCollections == null)
+ {
+ resourceCollections = new WebResourceCollectionsMetaData();
+ securityConstraint.setResourceCollections(resourceCollections);
+ }
+ WebResourceCollectionMetaData resourceCollection = new WebResourceCollectionMetaData();
+ resourceCollections.add(resourceCollection);
+
+ resourceCollection.setWebResourceName(ejbName);
+ resourceCollection.setUrlPatterns(Arrays.asList(new String[] { ep.getURLPattern() }));
+ ArrayList<String> httpMethods = new ArrayList<String>();
+ resourceCollection.setHttpMethods(httpMethods);
+ if (Boolean.TRUE.equals(secureWSDLAccess))
+ {
+ httpMethods.add("GET");
+ }
+ httpMethods.add("POST");
+
+ // Optional auth-constraint
+ if (beanAuthMethod != null)
+ {
+ // Only the first auth-method gives the war login-config/auth-method
+ if (authMethod == null)
+ authMethod = beanAuthMethod;
+
+ AuthConstraintMetaData authConstraint = new AuthConstraintMetaData();
+ authConstraint.setRoleNames(Arrays.asList(new String[] { "*" }));
+ securityConstraint.setAuthConstraint(authConstraint);
+ }
+ // Optional user-data-constraint
+ if (transportGuarantee != null)
+ {
+ UserDataConstraintMetaData userDataConstraint = new UserDataConstraintMetaData();
+ userDataConstraint.setTransportGuarantee(TransportGuaranteeType.valueOf(transportGuarantee));
+ securityConstraint.setUserDataConstraint(userDataConstraint);
+ }
+ }
+ }
+
+ // Optional login-config/auth-method
+ if (authMethod != null && securityHandler != null)
+ {
+ LoginConfigMetaData loginConfig = jbwmd.getLoginConfig();
+ if (loginConfig == null)
+ {
+ loginConfig = new LoginConfigMetaData();
+ jbwmd.setLoginConfig(loginConfig);
+ }
+ loginConfig.setAuthMethod(authMethod);
+ loginConfig.setRealmName("EJBServiceEndpointServlet Realm");
+
+ securityHandler.addSecurityRoles(jbwmd, dep);
+ }
+ }
+
+ /**
+ * Creates jboss-web meta data.
+ *
+ * <jboss-web>
+ * <security-domain>java:/jaas/custom-security-domain</security-domain>
+ * <context-root>/custom-context-root</context-root>
+ * <virtual-host>custom-virtual-host</virtual-host>
+ * </jboss-web>
+ *
+ * @param dep
+ * @param jbwmd
+ * @param securityHandler
+ */
+ protected void createJBossWebAppDescriptor
+ (
+ final Deployment dep, final JBossWebMetaData jbossWebMD, final SecurityHandler securityHandler
+ )
+ {
+ // Set security domain
+ if (securityHandler != null)
+ {
+ securityHandler.addSecurityDomain(jbossWebMD, dep);
+ }
+
+ // Set context root
+ String contextRoot = dep.getService().getContextRoot();
+ jbossWebMD.setContextRoot(contextRoot);
+
+ // Set virtual hosts
+ String[] virtualHosts = dep.getService().getVirtualHosts();
+ if (virtualHosts != null && virtualHosts.length > 0)
+ {
+ jbossWebMD.setVirtualHosts(Arrays.asList(virtualHosts));
+ }
+ }
+
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,199 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.integration.WSConstants;
+import org.jboss.wsf.common.integration.WSHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * The modifier of jboss web meta data.
+ * It configures WS transport for every webservice endpoint
+ * plus propagates WS stack specific context parameters if required.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WebMetaDataModifier
+{
+
+ /**
+ * Constructor.
+ */
+ public WebMetaDataModifier()
+ {
+ super();
+ }
+
+ /**
+ * Modifies web meta data to configure webservice stack transport and properties.
+ *
+ * @param dep webservice deployment
+ */
+ public void modify( final Deployment dep )
+ {
+ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment( dep, JBossWebMetaData.class );
+
+ this.propagateContextProps( dep, jbossWebMD );
+ this.configureEndpoints( dep, jbossWebMD );
+ }
+
+ /**
+ * Propagates stack specific context parameters if specified.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ @SuppressWarnings( "unchecked" )
+ private void propagateContextProps( final Deployment dep, final JBossWebMetaData jbossWebMD )
+ {
+ final Map< String, String > stackContextParams = ( Map< String, String > )
+ dep.getProperty( WSConstants.STACK_CONTEXT_PARAMS );
+
+ if ( stackContextParams != null )
+ {
+ final List< ParamValueMetaData > contextParams = this.getContextParams( jbossWebMD );
+
+ for ( Map.Entry< String, String > entry : stackContextParams.entrySet() )
+ {
+ final ParamValueMetaData newParam = this.newParameter( entry.getKey(), entry.getValue() );
+ contextParams.add( newParam );
+ }
+ }
+ }
+
+ /**
+ * Configures transport servlet class for every found webservice endpoint.
+ *
+ * @param dep webservice deployment
+ * @param jbossWebMD web meta data
+ */
+ private void configureEndpoints( final Deployment dep, final JBossWebMetaData jbossWebMD )
+ {
+ final Iterator< JBossServletMetaData > servlets = jbossWebMD.getServlets().iterator();
+
+ while ( servlets.hasNext() )
+ {
+ final ServletMetaData servletMD = servlets.next();
+ final ClassLoader loader = dep.getInitialClassLoader();
+ final boolean isWebserviceEndpoint = ASHelper.getEndpointClass( servletMD, loader ) != null;
+
+ if ( isWebserviceEndpoint )
+ {
+ // set transport servlet
+ servletMD.setServletClass( this.getTransportClassName( dep ) );
+
+ // configure webservice endpoint
+ final String endpointClassName = servletMD.getServletClass();
+ final List< ParamValueMetaData > initParams = this.getServletInitParams( servletMD );
+ final ParamValueMetaData endpointParam = this.newParameter(
+ Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName );
+
+ initParams.add( endpointParam );
+ }
+ }
+ }
+
+ /**
+ * Returns stack specific transport class name.
+ *
+ * @param dep webservice deployment
+ * @return stack specific transport class name
+ * @throws IllegalStateException if transport class name is not found in deployment properties map
+ */
+ private String getTransportClassName( final Deployment dep )
+ {
+ final String transportClassName = ( String ) dep.getProperty( WSConstants.STACK_TRANSPORT_CLASS );
+
+ if ( transportClassName == null )
+ {
+ throw new IllegalStateException( "Cannot obtain deployment property: " + WSConstants.STACK_TRANSPORT_CLASS );
+ }
+
+ return transportClassName;
+ }
+
+ /**
+ * Creates new parameter with specified key and value.
+ *
+ * @param key the key
+ * @param value the value
+ * @return new parameter
+ */
+ private ParamValueMetaData newParameter( final String key, final String value )
+ {
+ final ParamValueMetaData paramMD = new ParamValueMetaData();
+ paramMD.setParamName( key );
+ paramMD.setParamValue( value );
+
+ return paramMD;
+ }
+
+ /**
+ * Gets servlet init params list. Constructs new init params list if it does not exist yet.
+ *
+ * @param servletMD servlet meta data
+ * @return servlet init params list
+ */
+ private List< ParamValueMetaData > getServletInitParams( final ServletMetaData servletMD )
+ {
+ List< ParamValueMetaData > initParams = servletMD.getInitParam();
+
+ if ( initParams == null )
+ {
+ initParams = new ArrayList< ParamValueMetaData >();
+ servletMD.setInitParam( initParams );
+ }
+
+ return initParams;
+ }
+
+ /**
+ * Gets context params list. Constructs new context params list if it does not exist yet.
+ *
+ * @param jbossWebMD web meta data
+ * @return context params list
+ */
+ private List< ParamValueMetaData > getContextParams( final JBossWebMetaData jbossWebMD )
+ {
+ List< ParamValueMetaData > contextParams = jbossWebMD.getContextParams();
+
+ if ( contextParams == null )
+ {
+ contextParams = new ArrayList< ParamValueMetaData >();
+ jbossWebMD.setContextParams( contextParams );
+ }
+
+ return contextParams;
+ }
+
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-07-29 08:03:08 UTC (rev 10404)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.tomcat;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+
+/**
+ * Modifies web meta data to configure webservice stack endpoints and properties.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
+{
+
+ /** Web meta data modifier. */
+ private WebMetaDataModifier webMetaDataModifier;
+
+ /**
+ * Constructor.
+ */
+ public WebMetaDataModifyingDeploymentAspect()
+ {
+ super();
+ }
+
+ /**
+ * Sets Web meta data modifier. This method is called using MC injection.
+ *
+ * @param webMDModifier web meta data modifier
+ */
+ public void setWebMetaDataModifier( final WebMetaDataModifier webMDModifier )
+ {
+ this.webMetaDataModifier = webMDModifier;
+ }
+
+ /**
+ * Modifies web meta data.
+ *
+ * @param dep webservice deployment
+ */
+ public void start( final Deployment dep )
+ {
+ this.webMetaDataModifier.modify( dep );
+ }
+
+}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-29 07:55:15 UTC (rev 10403)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-29 08:03:08 UTC (rev 10404)
@@ -64,9 +64,9 @@
</bean>
<!-- Deployment aspect helper beans -->
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.webservices.integration.tomcat.ejb.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.webservices.integration.tomcat.ejb.SecurityHandlerEJB3"/>
- <bean name="WSWebMetaDataModifier" class="org.jboss.webservices.integration.tomcat.jse.WebMetaDataModifier"/>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.webservices.integration.tomcat.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.webservices.integration.tomcat.SecurityHandlerEJB3"/>
+ <bean name="WSWebMetaDataModifier" class="org.jboss.webservices.integration.tomcat.WebMetaDataModifier"/>
<!-- The AS specific deployment aspects -->
<bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.metadata.ContainerMetaDataDeploymentAspect">
@@ -135,14 +135,14 @@
<property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSWebMetaDataModifyingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.jse.WebMetaDataModifyingDeploymentAspect">
+ <bean name="WSWebMetaDataModifyingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebMetaDataModifyingDeploymentAspect">
<property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
<property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
<property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.webservices.integration.tomcat.ejb.WebAppGeneratorDeploymentAspect">
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.webservices.integration.tomcat.WebAppGeneratorDeploymentAspect">
<property name="requires">VirtualHosts,URLPattern</property>
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
14 years, 9 months
- 1
- 0
JBossWS SVN: r10403 - in container/jboss50/branches/ropalka-jboss510: src/main/resources and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 03:55:15 -0400 (Wed, 29 Jul 2009)
New Revision: 10403
Added:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.jar/
Modified:
container/jboss50/branches/ropalka-jboss510/pom.xml
container/jboss50/branches/ropalka-jboss510/src/main/scripts/assembly-resources.xml
Log:
[JBWS-2332] refactoring
Modified: container/jboss50/branches/ropalka-jboss510/pom.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/pom.xml 2009-07-29 07:36:20 UTC (rev 10402)
+++ container/jboss50/branches/ropalka-jboss510/pom.xml 2009-07-29 07:55:15 UTC (rev 10403)
@@ -221,7 +221,7 @@
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/jbossws-jboss50.jar</directory>
+ <directory>src/main/resources/jbossws-jboss.jar</directory>
</resource>
</resources>
<plugins>
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-29 07:55:15 UTC (rev 10403)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.webservices.integration.config.ServerConfigImpl">
+ <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 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>
+
+ <!-- deployers -->
+ <bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer">
+ <property name="name">webservices.xml</property>
+ <property name="useSchemaValidation">true</property>
+ </bean>
+
+ <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>
+
+ <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer">
+ <property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSDeploymentDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentDeployer">
+ <property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <!-- WSDeploymentAspectDeployers factory -->
+ <bean name="WSDeployersFactory" class="org.jboss.webservices.integration.deployers.WSDeployersFactory">
+ <constructor>
+ <parameter>
+ <inject bean="Deployers"/>
+ </parameter>
+ </constructor>
+ <incallback method="newDeployer"/>
+ </bean>
+
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.webservices.integration.tomcat.ejb.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.webservices.integration.tomcat.ejb.SecurityHandlerEJB3"/>
+ <bean name="WSWebMetaDataModifier" class="org.jboss.webservices.integration.tomcat.jse.WebMetaDataModifier"/>
+
+ <!-- The AS specific deployment aspects -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.metadata.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
+ <property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.webservices.integration.injection.InjectionMetaDataDeploymentAspect">
+ <property name="requires">WebMetaData</property>
+ <property name="provides">InjectionMetaData</property>
+ <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
+ <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <!-- TODO: remove this hacky aspect in AS trunk -->
+ <bean name="WSJACCPermissionsDeploymentAspect" class="org.jboss.webservices.integration.security.JACCPermissionsDeploymentAspect">
+ <property name="requires">WebMetaData</property>
+ <property name="provides">JACCPermisions</property>
+ <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ <property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">VirtualHosts</property>
+ <property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ <property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="provides">LifecycleHandler</property>
+ <property name="last">true</property>
+ <property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ <property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ <property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName</property>
+ <property name="provides">RegisteredEndpoint</property>
+ <property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ <property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSWebMetaDataModifyingDeploymentAspect" class="org.jboss.webservices.integration.tomcat.jse.WebMetaDataModifyingDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
+ <property name="provides">WebMetaData</property>
+ <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+ <property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.webservices.integration.tomcat.ejb.WebAppGeneratorDeploymentAspect">
+ <property name="requires">VirtualHosts,URLPattern</property>
+ <property name="provides">WebMetaData</property>
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+</deployment>
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2009-07-29 07:55:15 UTC (rev 10403)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2009-07-29 07:55:15 UTC (rev 10403)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.invocation.InvocationHandlerFactoryImpl
\ No newline at end of file
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2009-07-29 07:55:15 UTC (rev 10403)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.invocation.SecurityAdapterFactoryImpl
\ No newline at end of file
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2009-07-29 07:55:15 UTC (rev 10403)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Modified: container/jboss50/branches/ropalka-jboss510/src/main/scripts/assembly-resources.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/scripts/assembly-resources.xml 2009-07-29 07:36:20 UTC (rev 10402)
+++ container/jboss50/branches/ropalka-jboss510/src/main/scripts/assembly-resources.xml 2009-07-29 07:55:15 UTC (rev 10403)
@@ -10,8 +10,8 @@
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>jbossws-jboss50.deployer/**</include>
- <include>jbossws-jboss50.jar/**</include>
+ <include>jbossws-jboss.deployer/**</include>
+ <include>jbossws-jboss.jar/**</include>
</includes>
</fileSet>
</fileSets>
14 years, 9 months
- 1
- 0
JBossWS SVN: r10402 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration: deployers and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 03:36:20 -0400 (Wed, 29 Jul 2009)
New Revision: 10402
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB21MetaDataBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB3MetaDataBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/JSEMetaDataBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandler.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/WebAppGeneratorDeploymentAspect.java
Log:
fixing javadoc convention
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -31,7 +31,7 @@
/**
* A ServerConfig for AS <= 5.1.0
- *
+ *
* @author alessio.soldano(a)jboss.com
* @author Thomas.Diesler(a)jboss.org
*
@@ -43,7 +43,7 @@
{
return this.getDirFromServerConfig("ServerTempDir");
}
-
+
public File getHomeDir()
{
return this.getDirFromServerConfig("HomeDir");
@@ -53,14 +53,13 @@
{
return this.getDirFromServerConfig("ServerDataDir");
}
-
+
/**
* Obtains the specified attribute from the server configuration,
* represented as a {@link File}.
- *
+ *
* @param attributeName
* @return
- * @author ALR
*/
protected File getDirFromServerConfig(final String attributeName)
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,22 +1,23 @@
/*
- * JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware
- * LLC, and individual contributors 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.
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -28,7 +28,6 @@
/**
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public abstract class AbstractInvocationHandler extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -59,7 +59,6 @@
* Handles invocations on EJB21 endpoints.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class InvocationHandlerEJB21 extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -37,8 +37,6 @@
*
* @author Thomas.Diesler(a)jboss.org
* @author Heiko.Braun(a)jboss.com
- *
- * @since 25-Apr-2007
*/
public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -27,7 +27,6 @@
* The default invocation model factory fro AS 5.0.
*
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 19, 2007
*/
public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -32,7 +32,6 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class InvocationHandlerJAXRPC extends InvocationHandlerJSE
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -25,7 +25,6 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class InvocationHandlerJAXWS extends InvocationHandlerJSE
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -43,7 +43,6 @@
*
* @author Thomas.Diesler(a)jboss.org
* @author richard.opalka(a)jboss.com
- * @since 25-Apr-2007
*/
public class InvocationHandlerJSE extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -32,7 +32,6 @@
* Handles invocations on MDB EJB21 endpoints.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class InvocationHandlerMDB21 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -32,7 +32,6 @@
* Handles invocations on MDB EJB3 endpoints.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
*/
public class InvocationHandlerMDB3 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -26,7 +26,6 @@
/**
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
*/
public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -36,7 +36,6 @@
* A JBoss specific SecurityAssociationAdaptor
*
* @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
*/
public class SecurityAdaptorImpl implements SecurityAdaptor
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -37,7 +37,6 @@
* applied method level security to the invocation.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 21-Sep-2005
*/
public class ServiceEndpointInterceptor extends AbstractInterceptor
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB21MetaDataBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB21MetaDataBuilder.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB21MetaDataBuilder.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB3MetaDataBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB3MetaDataBuilder.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/EJB3MetaDataBuilder.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/JSEMetaDataBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/JSEMetaDataBuilder.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/JSEMetaDataBuilder.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandler.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandler.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandler.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -28,7 +28,6 @@
* Handle web app security meta data
*
* @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
*/
public interface SecurityHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB21.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB21.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB3.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/SecurityHandlerEJB3.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/WebAppGeneratorDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/WebAppGeneratorDeploymentAspect.java 2009-07-28 16:16:08 UTC (rev 10401)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/ejb/WebAppGeneratorDeploymentAspect.java 2009-07-29 07:36:20 UTC (rev 10402)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -50,7 +50,6 @@
* A deployment aspect that generates a webapp for an EJB endpoint
*
* @author Thomas.Diesler(a)jboss.org
- * @since 13-Oct-2007
*/
public class WebAppGeneratorDeploymentAspect extends DeploymentAspect
{
14 years, 9 months
- 1
- 0