[jboss-cvs] JBossAS SVN: r85256 - in trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 4 16:36:46 EST 2009
Author: pgier
Date: 2009-03-04 16:36:45 -0500 (Wed, 04 Mar 2009)
New Revision: 85256
Added:
trunk/connector/src/assembly/jboss-local-jdbc-rar.xml
trunk/connector/src/assembly/jboss-xa-jdbc-rar.xml
trunk/connector/src/assembly/jms-ra-rar.xml
trunk/connector/src/assembly/jms-ra.xml
trunk/connector/src/assembly/mail-ra-rar.xml
trunk/connector/src/assembly/quartz-ra-rar.xml
Removed:
trunk/connector/src/assembly/jboss-ra.xml
Modified:
trunk/build/build.xml
trunk/connector/pom.xml
trunk/pom.xml
Log:
[JBBUILD-506] Switch connector module to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-03-04 21:23:45 UTC (rev 85255)
+++ trunk/build/build.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -89,7 +89,7 @@
<!-- Modules -->
<module name="aspects" externalBuild="true"/>
<module name="cluster" externalBuild="true"/>
- <module name="connector"/>
+ <module name="connector" externalBuild="true"/>
<module name="console"/>
<module name="deployment" externalBuild="true"/>
<module name="ejb3"/>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2009-03-04 21:23:45 UTC (rev 85255)
+++ trunk/connector/pom.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -14,6 +14,7 @@
<description>JBoss Application Server (connector module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -31,15 +32,120 @@
<execution>
<id>assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ <descriptors>
+ <descriptor>src/assembly/jboss-common-jdbc-wrapper.xml</descriptor>
+ <descriptor>src/assembly/jbosscx-client.xml</descriptor>
+ <descriptor>src/assembly/jboss-jca.xml</descriptor>
+ <descriptor>src/assembly/jboss-jca-deployer.xml</descriptor>
+ <descriptor>src/assembly/jboss-local-jdbc.xml</descriptor>
+ <descriptor>src/assembly/jboss-local-jdbc-rar.xml</descriptor>
+ <descriptor>src/assembly/jboss-xa-jdbc.xml</descriptor>
+ <descriptor>src/assembly/jboss-xa-jdbc-rar.xml</descriptor>
+ <descriptor>src/assembly/jms-ra.xml</descriptor>
+ <descriptor>src/assembly/jms-ra-rar.xml</descriptor>
+ <descriptor>src/assembly/mail-ra.xml</descriptor>
+ <descriptor>src/assembly/mail-ra-rar.xml</descriptor>
+ <descriptor>src/assembly/quartz-ra.xml</descriptor>
+ <descriptor>src/assembly/quartz-ra-rar.xml</descriptor>
+ </descriptors>
</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>
+
+ <filter token="/" value="${file.separator}"/>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <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}-jboss-common-jdbc-wrapper.jar"
+ tofile="${output.lib}/jboss-common-jdbc-wrapper.jar"/>
+ <copy file="target/${project.build.finalName}-jbosscx-client.jar"
+ tofile="${output.lib}/jbosscx-client.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-jca.jar"
+ tofile="${output.lib}/jboss-jca.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-jca-deployer.jar"
+ tofile="${output.lib}/jboss-jca-deployer.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-local-jdbc.jar"
+ tofile="${output.lib}/jboss-local-jdbc.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-xa-jdbc.jar"
+ tofile="${output.lib}/jboss-xa-jdbc.jar"/>
+ <copy file="target/${project.build.finalName}-jms-ra.jar"
+ tofile="${output.lib}/jms-ra.jar"/>
+ <copy file="target/${project.build.finalName}-mail-ra.jar"
+ tofile="${output.lib}/mail-ra.jar"/>
+ <copy file="target/${project.build.finalName}-quartz-ra.jar"
+ tofile="${output.lib}/quartz-ra.jar"/>
+
+ <copy file="target/${project.build.finalName}-jboss-local-jdbc-rar.jar"
+ tofile="${output.lib}/jboss-local-jdbc.rar"/>
+ <copy file="target/${project.build.finalName}-jboss-xa-jdbc-rar.jar"
+ tofile="${output.lib}/jboss-xa-jdbc.rar"/>
+ <copy file="target/${project.build.finalName}-jms-ra-rar.jar"
+ tofile="${output.lib}/jms-ra.rar"/>
+ <copy file="target/${project.build.finalName}-mail-ra-rar.jar"
+ tofile="${output.lib}/mail-ra.rar"/>
+ <copy file="target/${project.build.finalName}-quartz-ra-rar.jar"
+ tofile="${output.lib}/quartz-ra.rar"/>
+
+ <copy file="${output.lib}/jboss-jca-deployer.jar" todir="${output.lib}/jboss-jca.deployer/"/>
+ <copy file="output/resources/deployers/jca-deployers-jboss-beans.xml" todir="${output.lib}/jboss-jca.deployer/META-INF"/>
+
+
+ </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>
Added: trunk/connector/src/assembly/jboss-local-jdbc-rar.xml
===================================================================
--- trunk/connector/src/assembly/jboss-local-jdbc-rar.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-local-jdbc-rar.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>jboss-local-jdbc-rar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/local-rar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/jboss-as-connector-jboss-local-jdbc.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>jboss-local-jdbc.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-local-jdbc-rar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/connector/src/assembly/jboss-ra.xml
===================================================================
--- trunk/connector/src/assembly/jboss-ra.xml 2009-03-04 21:23:45 UTC (rev 85255)
+++ trunk/connector/src/assembly/jboss-ra.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -1,16 +0,0 @@
-<assembly>
- <id>jms-ra</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/resource/adapter/jms/**</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Added: trunk/connector/src/assembly/jboss-xa-jdbc-rar.xml
===================================================================
--- trunk/connector/src/assembly/jboss-xa-jdbc-rar.xml (rev 0)
+++ trunk/connector/src/assembly/jboss-xa-jdbc-rar.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>jboss-xa-jdbc-rar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/xa-rar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/jboss-as-connector-jboss-xa-jdbc.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>jboss-xa-jdbc.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jboss-xa-jdbc-rar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/jms-ra-rar.xml
===================================================================
--- trunk/connector/src/assembly/jms-ra-rar.xml (rev 0)
+++ trunk/connector/src/assembly/jms-ra-rar.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>jms-ra-rar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/jms-rar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/jboss-as-connector-jms-ra.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>jms-ra.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jms-ra-rar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/connector/src/assembly/jms-ra.xml (from rev 85222, trunk/connector/src/assembly/jboss-ra.xml)
===================================================================
--- trunk/connector/src/assembly/jms-ra.xml (rev 0)
+++ trunk/connector/src/assembly/jms-ra.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jms-ra</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/resource/adapter/jms/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/jms-ra.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/mail-ra-rar.xml
===================================================================
--- trunk/connector/src/assembly/mail-ra-rar.xml (rev 0)
+++ trunk/connector/src/assembly/mail-ra-rar.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>mail-ra-rar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/mail-rar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/jboss-as-connector-mail-ra.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>mail-ra.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/mail-ra-rar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/connector/src/assembly/quartz-ra-rar.xml
===================================================================
--- trunk/connector/src/assembly/quartz-ra-rar.xml (rev 0)
+++ trunk/connector/src/assembly/quartz-ra-rar.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>quartz-ra-rar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/quartz-rar</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/jboss-as-connector-quartz-ra.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>quartz-ra.jar</destName>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
Property changes on: trunk/connector/src/assembly/quartz-ra-rar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-04 21:23:45 UTC (rev 85255)
+++ trunk/pom.xml 2009-03-04 21:36:45 UTC (rev 85256)
@@ -415,6 +415,7 @@
<module>iiop</module>
<module>aspects</module>
<module>profileservice</module>
+ <module>connector</module>
</modules>
</profile>
More information about the jboss-cvs-commits
mailing list