[jboss-cvs] JBossAS SVN: r85305 - in trunk: build and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 5 11:43:57 EST 2009
Author: pgier
Date: 2009-03-05 11:43:56 -0500 (Thu, 05 Mar 2009)
New Revision: 85305
Added:
trunk/tomcat/src/assembly/jboss-web-deployer.xml
trunk/webservices/src/assembly/
trunk/webservices/src/assembly/assembly-resources.xml
trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml
Removed:
trunk/webservices/src/scripts/assembly-resources.xml
Modified:
trunk/build/build.xml
trunk/pom.xml
trunk/tomcat/pom.xml
trunk/tomcat/src/assembly/jboss-web-service.xml
trunk/webservices/pom.xml
Log:
[JBBUILD-506] Switch tomcat and webservices modules to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/build/build.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -109,9 +109,9 @@
<module name="system" externalBuild="true"/>
<module name="system-jmx" externalBuild="true"/>
<module name="testsuite"/>
- <module name="tomcat"/>
+ <module name="tomcat" externalBuild="true"/>
<module name="varia" externalBuild="true"/>
- <module name="webservices"/>
+ <module name="webservices" externalBuild="true"/>
<!-- Module groups -->
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/pom.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -418,6 +418,8 @@
<module>connector</module>
<module>management</module>
<module>ejb3</module>
+ <module>tomcat</module>
+ <module>webservices</module>
</modules>
</profile>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/tomcat/pom.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -16,7 +16,11 @@
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
- <directory>src/resources</directory>
+ <directory>src/main</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/*.ser</exclude>
+ </excludes>
</resource>
</resources>
<plugins>
@@ -27,7 +31,7 @@
<execution>
<id>assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
</execution>
@@ -36,6 +40,135 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="output.resources" location="output/resources"/>
+ <mkdir dir="${output.resources}"/>
+ <copy todir="${output.resources}" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="output.deploy" location="output/deploy"/>
+ <mkdir dir="${output.deploy}"/>
+ <copy todir="${output.deploy}">
+ <fileset dir="src/webapps">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="output.lib" location="output/lib"/>
+ <mkdir dir="${output.lib}"/>
+ <copy file="target/${project.build.finalName}-jbossweb-cluster-aop.jar"
+ tofile="${output.lib}/jbossweb-cluster.aop"/>
+
+ <mkdir dir="${output.deploy}/jboss-web.deployer/META-INF"/>
+
+ <copy file="${output.resources}/web.xml"
+ tofile="${output.deploy}/jboss-web.deployer/web.xml"/>
+ <copy todir="${output.deploy}/jboss-web.deployer/META-INF">
+ <fileset dir="${output.resources}">
+ <include name="jboss-structure.xml" />
+ <include name="war-deployers-jboss-beans.xml" />
+ <include name="webserver-xmbean.xml" />
+ </fileset>
+ </copy>
+
+ <copy file="target/${project.build.finalName}-jboss-web-deployer.jar"
+ tofile="${output.deploy}/jboss-web.deployer/jboss-web-deployer.jar"/>
+
+ <mkdir dir="${output.deploy}/jbossweb.sar/META-INF"/>
+ <copy tofile="${output.deploy}/jbossweb.sar/META-INF/jboss-beans.xml"
+ file="${output.resources}/jboss-beans.xml"/>
+ <copy tofile="${output.deploy}/jbossweb.sar/META-INF/jboss-structure.xml"
+ file="${output.resources}/jboss-structure-sar.xml"/>
+
+ <property name="thirdparty.dir" location="../thirdparty"/>
+
+ <copy file="${output.resources}/context.xml"
+ todir="${output.deploy}/jbossweb.sar"/>
+ <copy file="${output.resources}/server.xml"
+ tofile="${output.deploy}/jbossweb.sar/server.xml"/>
+ <copy todir="${output.deploy}/jbossweb.sar">
+ <fileset dir="${thirdparty.dir}/jboss/web/lib">
+ <include name="*.jar"/>
+ <exclude name="el-api.jar"/>
+ <exclude name="jsp-api.jar"/>
+ <exclude name="servlet-api.jar"/>
+ <exclude name="jbossweb-sources.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${output.deploy}/jbossweb.sar"
+ file="${thirdparty.dir}/sun-jstl/lib/jstl.jar" />
+ <mkdir dir="${output.deploy}/jbossweb.sar/jsf-libs"/>
+ <copy todir="${output.deploy}/jbossweb.sar/jsf-libs">
+ <fileset dir="${thirdparty.dir}/sun-jsf/lib">
+ <include name="*.jar"/>
+ <exclude name="*-sources.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- jar for jsf integration classes -->
+ <copy file="target/${project.build.finalName}-jboss-faces.jar"
+ tofile="${output.deploy}/jbossweb.sar/jsf-libs/jboss-faces.jar"/>
+
+ <copy file="target/${project.build.finalName}-jboss-web-service.jar"
+ tofile="${output.deploy}/jbossweb.sar/jboss-web-service.jar"/>
+
+ <!-- jar for fine grained aop -->
+ <!-- package in .aop. This is used for fine-grained replication -->
+ <copy file="target/${project.build.finalName}-jbossweb-cluster-aop.jar"
+ tofile="${output.lib}/jbossweb-cluster.aop"/>
+
+ <!-- Cluster caches and aop descriptor used for fine-grained replication -->
+ <mkdir dir="${output.deploy}/cluster"/>
+ <copy todir="${output.deploy}/cluster"
+ file="${output.lib}/jbossweb-cluster.aop"/>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -49,7 +182,7 @@
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>com.sun</groupId>
+ <groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
Added: trunk/tomcat/src/assembly/jboss-web-deployer.xml
===================================================================
--- trunk/tomcat/src/assembly/jboss-web-deployer.xml (rev 0)
+++ trunk/tomcat/src/assembly/jboss-web-deployer.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -0,0 +1,22 @@
+<assembly>
+ <id>jboss-web-deployer</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/ClusteringDependencyDeployer.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/DeployerConfig.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/TomcatDeployer.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/TomcatDeployer$ENCLoader.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.class</include>
+ <include>org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/tomcat/src/assembly/jboss-web-deployer.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/tomcat/src/assembly/jboss-web-service.xml
===================================================================
--- trunk/tomcat/src/assembly/jboss-web-service.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/tomcat/src/assembly/jboss-web-service.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -11,15 +11,31 @@
<includes>
<include>org/jboss/net/**</include>
<include>org/jboss/web/tomcat/filters/**</include>
+ <include>org/jboss/web/tomcat/metadata/**</include>
<include>org/jboss/web/tomcat/servlets/**</include>
<include>org/jboss/web/tomcat/service/**</include>
<include>org/jboss/web/tomcat/security/**</include>
<include>org/jboss/web/tomcat/statistics/**</include>
</includes>
<excludes>
+ <exclude>org/jboss/web/tomcat/service/deployers/ClusteringDefaultsDeployer.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/ClusteringDependencyDeployer.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/DeployerConfig.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployer.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployer$ENCLoader.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.class</exclude>
+ <exclude>org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.class</exclude>
+ <exclude>org/jboss/**/*.properties</exclude>
<exclude>org/jboss/web/tomcat/service/session/AopMarker*</exclude>
<exclude>org/jboss/web/tomcat/service/session/InstanceOfAopMarker*</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/**/*.properties</include>
+ </includes>
+ </fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/webservices/pom.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -13,6 +13,95 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (webservices module)</description>
+ <!-- Plugins -->
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/resources/jbossws-jboss60.jar</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="output.resources" location="output/resources"/>
+ <mkdir dir="${output.resources}"/>
+ <copy todir="${output.resources}" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="output.lib" location="output/lib"/>
+ <mkdir dir="${output.lib}"/>
+ <copy file="target/${project.build.finalName}.jar"
+ tofile="${output.lib}/jbossws-jboss60.jar"/>
+ <copy file="target/${project.build.finalName}-jbossws-jboss60-deployer.zip"
+ tofile="${output.lib}/jbossws-jboss60-deployer.zip"/>
+
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Dependencies -->
<dependencies>
<!-- jbossws dependencies -->
@@ -22,6 +111,10 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
<!-- jboss provided dependencies -->
@@ -109,32 +202,4 @@
</dependency>
</dependencies>
- <!-- Plugins -->
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources/jbossws-jboss60.jar</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/scripts/assembly-resources.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
Copied: trunk/webservices/src/assembly/assembly-resources.xml (from rev 85301, trunk/webservices/src/scripts/assembly-resources.xml)
===================================================================
--- trunk/webservices/src/assembly/assembly-resources.xml (rev 0)
+++ trunk/webservices/src/assembly/assembly-resources.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossws-jboss60.deployer/**</include>
+ <include>jbossws-jboss60.jar/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: trunk/webservices/src/assembly/assembly-resources.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Added: trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml
===================================================================
--- trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml (rev 0)
+++ trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -0,0 +1,32 @@
+<assembly>
+ <id>jbossws-jboss60-deployer</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/jbossws-jboss60.deployer</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>META-INF/jbossws-deployer-jboss-beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/${project.build.finalName}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>jbossws-jboss60.jar</destName>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.ws:jbossws-common</include>
+ <include>org.jboss.ws:jbossws-framework</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Property changes on: trunk/webservices/src/assembly/jbossws-jboss60-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/webservices/src/scripts/assembly-resources.xml
===================================================================
--- trunk/webservices/src/scripts/assembly-resources.xml 2009-03-05 16:22:38 UTC (rev 85304)
+++ trunk/webservices/src/scripts/assembly-resources.xml 2009-03-05 16:43:56 UTC (rev 85305)
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
- <id>resources</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossws-jboss60.deployer/**</include>
- <include>jbossws-jboss60.jar/**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
More information about the jboss-cvs-commits
mailing list