[jboss-cvs] JBossAS SVN: r74995 - in trunk/webservices: src/main/org/jboss/wsf/container/jboss50/transport and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 24 13:06:51 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-06-24 13:06:51 -0400 (Tue, 24 Jun 2008)
New Revision: 74995
Modified:
trunk/webservices/pom.xml
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
trunk/webservices/src/scripts/assembly-container.xml
trunk/webservices/src/scripts/assembly-resources.xml
Log:
[JBWS-2238] fix maven build + sync java sources
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2008-06-24 15:46:17 UTC (rev 74994)
+++ trunk/webservices/pom.xml 2008-06-24 17:06:51 UTC (rev 74995)
@@ -12,109 +12,86 @@
<name>JBoss Application Server Webservices</name>
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server (webservices module)</description>
+
+ <!-- Dependencies -->
<dependencies>
- <!-- Compile (global dependencies) -->
+ <!-- jbossws dependencies -->
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
</dependency>
+ <!-- jboss provided dependencies -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <scope>provided</scope>
</dependency>
+ <!-- transitive dependencies -->
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
</dependencies>
<!-- Plugins -->
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java 2008-06-24 15:46:17 UTC (rev 74994)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java 2008-06-24 17:06:51 UTC (rev 74995)
@@ -23,6 +23,7 @@
// $Id$
+import org.jboss.deployers.client.spi.DeploymentFactory;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -60,21 +61,25 @@
throw new IllegalArgumentException("Web meta data is cannot be null");
DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
- if (unit == null)
- throw new IllegalStateException("Cannot obtain deployment unit");
-
- try
+ if (unit != null)
{
- webMetaDataModifier.modifyMetaData(dep);
-
- // Attaching it to the DeploymentUnit will cause a new webapp deployment
- unit.addAttachment(JBossWebMetaData.class, jbwmd);
- unit.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+ try
+ {
+ webMetaDataModifier.modifyMetaData(dep);
+
+ // Attaching it to the DeploymentUnit will cause a new webapp deployment
+ unit.addAttachment(JBossWebMetaData.class, jbwmd);
+ unit.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+ }
+ catch (Exception ex)
+ {
+ WSFDeploymentException.rethrow(ex);
+ }
}
- catch (Exception ex)
+ else
{
- WSFDeploymentException.rethrow(ex);
+ throw new IllegalStateException("Cannot obtain deployment unit");
}
return unit;
Modified: trunk/webservices/src/scripts/assembly-container.xml
===================================================================
--- trunk/webservices/src/scripts/assembly-container.xml 2008-06-24 15:46:17 UTC (rev 74994)
+++ trunk/webservices/src/scripts/assembly-container.xml 2008-06-24 17:06:51 UTC (rev 74995)
@@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/main/resources/jbossws-jboss50-container.jar</directory>
+ <directory>src/resources/jbossws-jboss50-container.jar</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: trunk/webservices/src/scripts/assembly-resources.xml
===================================================================
--- trunk/webservices/src/scripts/assembly-resources.xml 2008-06-24 15:46:17 UTC (rev 74994)
+++ trunk/webservices/src/scripts/assembly-resources.xml 2008-06-24 17:06:51 UTC (rev 74995)
@@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>jbossws-jboss50.deployer/**</include>
More information about the jboss-cvs-commits
mailing list