JBossWS SVN: r7241 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 11:48:35 -0400 (Fri, 30 May 2008)
New Revision: 7241
Modified:
container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
Log:
[JBWS-2174] introduce WebMetaData and reorder aspects
Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 15:38:52 UTC (rev 7240)
+++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-30 15:48:35 UTC (rev 7241)
@@ -123,7 +123,7 @@
-->
<bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
+ <property name="provides">ContainerMetaData,VFSRoot</property>
</bean>
<bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
@@ -133,11 +133,11 @@
<bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.framework.deployment.HttpTransportDeploymentAspect">
<property name="requires">URLPattern,ContextProperties</property>
- <property name="provides">EndpointAddress</property>
+ <property name="provides">EndpointAddress,WebMetaData</property>
</bean>
<bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
+ <property name="provides">ContainerMetaData,RuntimeLoader,URLPattern,VFSRoot</property>
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
@@ -165,7 +165,7 @@
</bean>
<bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect">
- <property name="requires">ContextProperties, StackDescriptor</property>
+ <property name="requires">ContextProperties,StackDescriptor,WebMetaData</property>
</bean>
<bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
@@ -174,7 +174,7 @@
</bean>
<bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
- <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="requires">ContextRoot,ContainerMetaData</property>
<property name="provides">URLPattern</property>
</bean>
16 years, 6 months
JBossWS SVN: r7240 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 11:38:52 -0400 (Fri, 30 May 2008)
New Revision: 7240
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 15:38:52 UTC (rev 7240)
@@ -28,7 +28,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.wsf.spi.annotation.WebContext;
/**
16 years, 6 months
JBossWS SVN: r7239 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: samples/news and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 11:37:47 -0400 (Fri, 30 May 2008)
New Revision: 7239
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239)
@@ -43,7 +43,6 @@
import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.addressing.JAXWSAConstants;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -61,7 +60,8 @@
serviceName = "DarService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-@SecurityDomain("JBossWS")
+//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
+//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/dar",
urlPattern="/*",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239)
@@ -43,7 +43,8 @@
serviceName = "DarService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-@SecurityDomain("JBossWS")
+//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
+//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/dar",
urlPattern="/*",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239)
@@ -26,7 +26,6 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.BindingType;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -37,7 +36,8 @@
serviceName = "NewspaperMTOMService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-@SecurityDomain("JBossWS")
+//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
+//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/news",
urlPattern="/newspaper/mtom",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239)
@@ -25,7 +25,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -36,7 +35,8 @@
serviceName = "NewspaperSWAService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-@SecurityDomain("JBossWS")
+//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
+//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/news",
urlPattern="/newspaper/swa",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-05-30 13:36:11 UTC (rev 7238)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-05-30 15:37:47 UTC (rev 7239)
@@ -28,7 +28,6 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -37,7 +36,8 @@
@SOAPBinding(style = Style.RPC)
@WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
-@SecurityDomain("JBossWS")
+//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
+//@SecurityDomain("JBossWS")
@RolesAllowed("friend")
public class SecureEndpointImpl
{
16 years, 6 months
JBossWS SVN: r7238 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:36:11 -0400 (Fri, 30 May 2008)
New Revision: 7238
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
Log:
Remove static qualifier
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-30 13:35:18 UTC (rev 7237)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-30 13:36:11 UTC (rev 7238)
@@ -47,7 +47,7 @@
public class DescriptorDeploymentAspect extends DeploymentAspect
{
// provide logging
- private static final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class);
+ private final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class);
private String invokerEJB3;
private String invokerJSE;
@@ -92,7 +92,7 @@
* @param dep deployment which initial classloader will be used
* @return <b>cxf.xml URL</b> or <b>null</b> if not found
*/
- private static URL getCXFConfigFromClassLoader(Deployment dep)
+ private URL getCXFConfigFromClassLoader(Deployment dep)
{
ClassLoader initCL = dep.getInitialClassLoader();
URL cxfURL = initCL.getResource("cxf.xml");
@@ -112,7 +112,7 @@
* @param dep deployment where to look for resources
* @return <b>jbossws-cxf.xml URL</b> or <b>null</b> if not found
*/
- private static URL getCXFConfigFromDeployment(Deployment dep)
+ private URL getCXFConfigFromDeployment(Deployment dep)
{
DeploymentType depType = dep.getType();
@@ -195,7 +195,7 @@
* @param dep deployment where to put
* @param cxfURL to be put
*/
- private static void putCXFConfigToDeployment(Deployment dep, URL cxfURL)
+ private void putCXFConfigToDeployment(Deployment dep, URL cxfURL)
{
// get property map
String propKey = "org.jboss.ws.webapp.ContextParameterMap";
16 years, 6 months
JBossWS SVN: r7237 - in stack/cxf/trunk: modules and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:35:18 -0400 (Fri, 30 May 2008)
New Revision: 7237
Added:
stack/cxf/trunk/modules/packeting/
stack/cxf/trunk/modules/packeting/pom.xml
Removed:
stack/cxf/trunk/modules/packeting/pom.xml
Modified:
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Copied: stack/cxf/trunk/modules/packeting (from rev 7235, stack/native/trunk/modules/packeting)
Deleted: stack/cxf/trunk/modules/packeting/pom.xml
===================================================================
--- stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:16:26 UTC (rev 7235)
+++ stack/cxf/trunk/modules/packeting/pom.xml 2008-05-30 13:35:18 UTC (rev 7237)
@@ -1,66 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Native Packeting</name>
- <artifactId>jbossws-native-packeting</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss421</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <type>sar</type>
- </dependency>
- </dependencies>
-
-</project>
Copied: stack/cxf/trunk/modules/packeting/pom.xml (from rev 7236, stack/native/trunk/modules/packeting/pom.xml)
===================================================================
--- stack/cxf/trunk/modules/packeting/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/packeting/pom.xml 2008-05-30 13:35:18 UTC (rev 7237)
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack CXF Packeting</name>
+ <artifactId>jbossws-cxf-packeting</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-05-30 13:30:30 UTC (rev 7236)
+++ stack/cxf/trunk/pom.xml 2008-05-30 13:35:18 UTC (rev 7237)
@@ -34,6 +34,7 @@
<module>modules/management</module>
<module>modules/server</module>
<module>modules/client</module>
+ <module>modules/packeting</module>
</modules>
<!-- Properties -->
@@ -292,84 +293,6 @@
</dependencies>
</dependencyManagement>
- <!-- Runtime dependencies, not visible at compile time -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- </dependencies>
-
<!-- Plugins -->
<build>
<plugins>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:30:30 UTC (rev 7236)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:35:18 UTC (rev 7237)
@@ -7,47 +7,6 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss422:jar</include>
- <include>*:jbossws-jboss423:jar</include>
- <include>*:jbossws-jboss500:jar</include>
- <include>*:jbossws-jboss501:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <!-- lib -->
<moduleSets>
<moduleSet>
<includes>
@@ -111,6 +70,47 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws.cxf:jbossws-cxf-packeting</include>
+ </includes>
+ <binaries>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
+ <include>*:jbossws-jboss500:jar</include>
+ <include>*:jbossws-jboss501:jar</include>
+ <include>*:juddi-service:sar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
</moduleSets>
<!-- resources -->
16 years, 6 months
JBossWS SVN: r7236 - in stack/metro/trunk: modules and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:30:30 -0400 (Fri, 30 May 2008)
New Revision: 7236
Added:
stack/metro/trunk/modules/packeting/
stack/metro/trunk/modules/packeting/pom.xml
Removed:
stack/metro/trunk/modules/packeting/pom.xml
Modified:
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Add module packeting. Remove top level dependencies.
Copied: stack/metro/trunk/modules/packeting (from rev 7235, stack/native/trunk/modules/packeting)
Deleted: stack/metro/trunk/modules/packeting/pom.xml
===================================================================
--- stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:16:26 UTC (rev 7235)
+++ stack/metro/trunk/modules/packeting/pom.xml 2008-05-30 13:30:30 UTC (rev 7236)
@@ -1,66 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Native Packeting</name>
- <artifactId>jbossws-native-packeting</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss421</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>container</classifier>
- </dependency>
- <dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <type>sar</type>
- </dependency>
- </dependencies>
-
-</project>
Copied: stack/metro/trunk/modules/packeting/pom.xml (from rev 7234, stack/native/trunk/modules/packeting/pom.xml)
===================================================================
--- stack/metro/trunk/modules/packeting/pom.xml (rev 0)
+++ stack/metro/trunk/modules/packeting/pom.xml 2008-05-30 13:30:30 UTC (rev 7236)
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Metro Packeting</name>
+ <artifactId>jbossws-metro-packeting</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.metro</groupId>
+ <artifactId>jbossws-metro</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-05-30 13:16:26 UTC (rev 7235)
+++ stack/metro/trunk/pom.xml 2008-05-30 13:30:30 UTC (rev 7236)
@@ -35,6 +35,7 @@
<module>modules/server</module>
<module>modules/client</module>
<module>modules/wsit</module>
+ <module>modules/packeting</module>
</modules>
<!-- Properties -->
@@ -272,84 +273,6 @@
</dependencies>
</dependencyManagement>
- <!-- Runtime dependencies, not visible at compile time -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- </dependencies>
-
<!-- Plugins -->
<build>
<plugins>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:16:26 UTC (rev 7235)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:30:30 UTC (rev 7236)
@@ -7,47 +7,6 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss422:jar:*</include>
- <include>*:jbossws-jboss423:jar:*</include>
- <include>*:jbossws-jboss500:jar:*</include>
- <include>*:jbossws-jboss501:jar:*</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <!-- lib -->
<moduleSets>
<moduleSet>
<includes>
@@ -114,6 +73,47 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws.metro:jbossws-metro-packeting</include>
+ </includes>
+ <binaries>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
+ <include>*:jbossws-jboss500:jar</include>
+ <include>*:jbossws-jboss501:jar</include>
+ <include>*:juddi-service:sar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
<!--
Does not work with maven-2.0.9
This should include the output from module wsit
16 years, 6 months
JBossWS SVN: r7235 - stack/native/trunk/modules/packeting.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:16:26 -0400 (Fri, 30 May 2008)
New Revision: 7235
Modified:
stack/native/trunk/modules/packeting/
Log:
svn:ignore
Property changes on: stack/native/trunk/modules/packeting
___________________________________________________________________
Name: svn:ignore
+ target
16 years, 6 months
JBossWS SVN: r7234 - in stack/native/trunk: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:14:46 -0400 (Fri, 30 May 2008)
New Revision: 7234
Modified:
stack/native/trunk/modules/packeting/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Fix file mapping
Modified: stack/native/trunk/modules/packeting/pom.xml
===================================================================
--- stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
+++ stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:14:46 UTC (rev 7234)
@@ -4,7 +4,7 @@
<name>JBoss Web Services - Stack Native Packeting</name>
<artifactId>jbossws-native-packeting</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<!-- Parent -->
<parent>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:00:32 UTC (rev 7233)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:14:46 UTC (rev 7234)
@@ -100,6 +100,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<unpack>false</unpack>
<includes>
16 years, 6 months
JBossWS SVN: r7233 - in stack/native/trunk: modules and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-30 09:00:32 -0400 (Fri, 30 May 2008)
New Revision: 7233
Added:
stack/native/trunk/modules/packeting/
Removed:
stack/native/trunk/modules/deployment/
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/packeting/pom.xml
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Add module packeting. Remove top level dependencies
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/modules/core/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -72,8 +72,15 @@
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <scope>provided</scope>
+ <version>1.0.0.SP2</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>provided</scope>
Copied: stack/native/trunk/modules/packeting (from rev 7232, stack/native/trunk/modules/deployment)
Modified: stack/native/trunk/modules/packeting/pom.xml
===================================================================
--- stack/native/trunk/modules/deployment/pom.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/modules/packeting/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack Native Deployment</name>
- <artifactId>jbossws-native-deployment</artifactId>
+ <name>JBoss Web Services - Stack Native Packeting</name>
+ <artifactId>jbossws-native-packeting</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
@@ -19,9 +19,48 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
<classifier>scripts</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss421</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <classifier>container</classifier>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ </dependency>
</dependencies>
</project>
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -14,6 +14,16 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>testsuite</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
<!-- Plugins -->
<build>
<plugins>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -35,6 +35,10 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
<version>${version}</version>
@@ -52,16 +56,6 @@
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
</dependency>
@@ -412,6 +406,10 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
@@ -421,10 +419,6 @@
<artifactId>jbossall-client</artifactId>
<version>${jboss.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/pom.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -39,6 +39,7 @@
<module>modules/client</module>
<module>modules/embedded</module>
<module>modules/management</module>
+ <module>modules/packeting</module>
</modules>
<!-- Properties -->
@@ -59,7 +60,6 @@
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
<jboss.jbosssx.version>2.0.2.Beta4</jboss.jbosssx.version>
- <jboss.jbossxb.version>1.0.0.SP2</jboss.jbossxb.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version>
<jboss.remoting.version>2.4.0.CR1</jboss.remoting.version>
@@ -226,11 +226,6 @@
<version>${jboss.common.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${jboss.jbossxb.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>${jboss.jbosssx.version}</version>
@@ -358,114 +353,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <!-- Provided dependencies, visible to all modules -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Runtime dependencies, not visible at compile time -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>testsuite</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss421</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss421</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>container</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501</artifactId>
- <classifier>resources</classifier>
- <scope>runtime</scope>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <scope>runtime</scope>
- <type>sar</type>
- </dependency>
- </dependencies>
-
<!-- Plugins -->
<build>
<plugins>
@@ -537,34 +424,14 @@
<profiles>
<!--
- Name: jdk16
- Descr: Compile with jdk1.6
- -->
- <profile>
- <id>jdk16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerVersion>1.5</compilerVersion>
- <executable>${java.jdk15.home}/bin/javac</executable>
- <fork>true</fork>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: bindist
Descr: Build the binary distribution
-->
<profile>
<id>bindist</id>
+ <modules>
+ <module>modules/deployment</module>
+ </modules>
<build>
<plugins>
<plugin>
@@ -643,6 +510,29 @@
</profile>
<!--
+ Name: jdk16
+ Descr: Compile with jdk1.6
+ -->
+ <profile>
+ <id>jdk16</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerVersion>1.5</compilerVersion>
+ <executable>${java.jdk15.home}/bin/javac</executable>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 12:08:02 UTC (rev 7232)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-30 13:00:32 UTC (rev 7233)
@@ -7,49 +7,6 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-jboss421:jar</include>
- <include>*:jbossws-jboss422:jar</include>
- <include>*:jbossws-jboss423:jar</include>
- <include>*:jbossws-jboss500:jar</include>
- <include>*:jbossws-jboss501:jar</include>
- <include>*:juddi-service:sar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
<!-- lib -->
<moduleSets>
<moduleSet>
@@ -127,6 +84,47 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-packeting</include>
+ </includes>
+ <binaries>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-framework:jar</include>
+ <include>*:jbossws-jboss421:jar</include>
+ <include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
+ <include>*:jbossws-jboss500:jar</include>
+ <include>*:jbossws-jboss501:jar</include>
+ <include>*:juddi-service:sar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
</moduleSets>
<fileSets>
16 years, 6 months
JBossWS SVN: r7232 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/resources/jaxws/samples/wsse/sign/WEB-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-30 08:08:02 -0400 (Fri, 30 May 2008)
New Revision: 7232
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
Log:
[JBWS-2098] Moving deployed test resource file to WEB-INF/classes
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-30 10:59:18 UTC (rev 7231)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-30 12:08:02 UTC (rev 7232)
@@ -62,9 +62,11 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
<include name="jbossws-cxf.xml"/>
<include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
<include name="bob.properties" />
- <include name="bob.jks" />
- </webinf>
+ </zipfileset>
</war>
<!-- jaxws-samples-wsse-sign-client -->
@@ -87,12 +89,14 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
<include name="jbossws-cxf.xml"/>
<include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
<include name="bob.properties" />
- <include name="bob.jks" />
- </webinf>
+ </zipfileset>
</war>
- <!-- jaxws-samples-wsse-sign-client-encrypt -->
+ <!-- jaxws-samples-wsse-sign-encrypt-client -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
<include name="alice.properties" />
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties 2008-05-30 10:59:18 UTC (rev 7231)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties 2008-05-30 12:08:02 UTC (rev 7232)
@@ -2,4 +2,4 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=bob.jks
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 10:59:18 UTC (rev 7231)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 12:08:02 UTC (rev 7232)
@@ -14,7 +14,7 @@
<constructor-arg>
<map>
<entry key="action" value="Timestamp Signature"/>
- <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
<entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
</map>
</constructor-arg>
@@ -25,7 +25,7 @@
<map>
<entry key="action" value="Timestamp Signature"/>
<entry key="user" value="bob"/>
- <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties 2008-05-30 10:59:18 UTC (rev 7231)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties 2008-05-30 12:08:02 UTC (rev 7232)
@@ -2,4 +2,4 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=bob.jks
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 10:59:18 UTC (rev 7231)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 12:08:02 UTC (rev 7232)
@@ -14,8 +14,8 @@
<constructor-arg>
<map>
<entry key="action" value="Timestamp Signature Encrypt"/>
- <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
- <entry key="decryptionPropFile" value="WEB-INF/bob.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
+ <entry key="decryptionPropFile" value="bob.properties"/>
<entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
</map>
</constructor-arg>
@@ -26,8 +26,8 @@
<map>
<entry key="action" value="Timestamp Signature Encrypt"/>
<entry key="user" value="bob"/>
- <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
- <entry key="encryptionPropFile" value="WEB-INF/bob.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
+ <entry key="encryptionPropFile" value="bob.properties"/>
<entry key="encryptionUser" value="Alice"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
16 years, 6 months