[jboss-cvs] JBossAS SVN: r85362 - in trunk: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 5 16:43:16 EST 2009
Author: pgier
Date: 2009-03-05 16:43:16 -0500 (Thu, 05 Mar 2009)
New Revision: 85362
Added:
trunk/console/src/assembly/console-mgr-sar.xml
trunk/console/src/assembly/jboss-console-client.xml
trunk/console/src/assembly/jboss-console.xml
trunk/spring-int/src/assembly/
trunk/spring-int/src/assembly/jboss-spring-deployer.xml
Removed:
trunk/console/src/assembly/console-client.xml
trunk/hibernate-int/component-info.xml
Modified:
trunk/build/build.xml
trunk/console/pom.xml
trunk/console/src/assembly/applet.xml
trunk/console/src/assembly/web-console.xml
trunk/ejb3/pom.xml
trunk/hibernate-int/pom.xml
trunk/pom.xml
trunk/spring-int/pom.xml
Log:
[JBBUILD-506] Switch hibernate, console, and spring modules to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/build/build.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -90,11 +90,11 @@
<module name="aspects" externalBuild="true"/>
<module name="cluster" externalBuild="true"/>
<module name="connector" externalBuild="true"/>
- <module name="console"/>
+ <module name="console" externalBuild="true"/>
<module name="deployment" externalBuild="true"/>
<module name="ejb3" externalBuild="true"/>
<module name="embedded"/>
- <module name="hibernate-int"/>
+ <module name="hibernate-int" externalBuild="true"/>
<module name="iiop" externalBuild="true"/>
<module name="main" externalBuild="true"/>
<module name="management" externalBuild="true"/>
@@ -105,7 +105,7 @@
<module name="profileservice" externalBuild="true"/>
<module name="security" externalBuild="true"/>
<module name="server" externalBuild="true"/>
- <module name="spring-int"/>
+ <module name="spring-int" externalBuild="true"/>
<module name="system" externalBuild="true"/>
<module name="system-jmx" externalBuild="true"/>
<module name="testsuite"/>
@@ -1028,7 +1028,7 @@
<target name="maven-install" description="Run the install goal against the maven build"
depends="maven-init">
- <property name="maven.install.opts" value="-Pintegrated-build"/>
+ <property name="maven.install.opts" value=""/>
<maven basedir="${basedir}/.."
options="${maven.install.opts}"
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/console/pom.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -18,20 +18,120 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <!--<version>2.2-beta-3-SNAPSHOT</version>-->
<executions>
<execution>
- <id>assembly</id>
+ <id>assembly-console</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/console.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.console.text.CommandLineConsole</Main-Class>
+ <Class-Path>../client/getopt.jar ../client/jboss-common-client.jar ../client/jboss-system-client.jar ../client/jmx-rmi-connector-client.jar ../client/jnp-client.jar ../client/jboss-j2ee.jar ../client/log4j.jar ../client/jnet.jar ../lib/jboss-jmx.jar </Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
</execution>
+ <execution>
+ <id>assembly-all</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/applet.xml</descriptor>
+ <descriptor>src/assembly/console-mgr-classes.xml</descriptor>
+ <descriptor>src/assembly/jboss-console.xml</descriptor>
+ <descriptor>src/assembly/jboss-console-client.xml</descriptor>
+ <descriptor>src/assembly/twiddle.xml</descriptor>
+ <descriptor>src/assembly/web-console.xml</descriptor>
+ <descriptor>src/assembly/console-mgr-sar.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
</executions>
- <configuration>
- <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>
+
+ <property name="output.bin" location="output/bin"/>
+ <mkdir dir="${output.bin}"/>
+ <copy todir="${output.bin}" filtering="yes">
+ <fileset dir="src/bin">
+ <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}-applet.jar"
+ tofile="${output.lib}/applet.jar"/>
+ <copy file="target/${project.build.finalName}-console.jar"
+ tofile="${output.lib}/console.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-console-client.jar"
+ tofile="${output.lib}/jboss-console-client.jar"/>
+ <copy file="target/${project.build.finalName}-console-mgr-classes.jar"
+ tofile="${output.lib}/console-mgr-classes.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-console.jar"
+ tofile="${output.lib}/jboss-console.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-console-client.jar"
+ tofile="${output.lib}/jboss-console-client.jar"/>
+ <copy file="target/${project.build.finalName}-twiddle.jar"
+ tofile="${output.lib}/twiddle.jar"/>
+ <copy file="target/${project.build.finalName}-web-console.war"
+ tofile="${output.lib}/web-console.war"/>
+ <copy file="target/${project.build.finalName}-console-mgr-sar.jar"
+ tofile="${output.lib}/console-mgr.sar"/>
+
+ </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>
@@ -56,11 +156,15 @@
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
- <dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
<dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
@@ -73,6 +177,10 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
Modified: trunk/console/src/assembly/applet.xml
===================================================================
--- trunk/console/src/assembly/applet.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/console/src/assembly/applet.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -19,6 +19,12 @@
</fileSet>
</fileSets>
<dependencySets>
+ <!--<dependencySet>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.jboss.jbossas:jboss-as-server-jmx-rmi-adaptor</include>
+ </includes>
+ </dependencySet>-->
<dependencySet>
<unpack>true</unpack>
<includes>
@@ -35,6 +41,9 @@
<includes>
<include>org/jboss/invocation/*</include>
</includes>
+ <excludes>
+ <exclude>META-INF/INDEX.LIST</exclude>
+ </excludes>
</unpackOptions>
</dependencySet>
<dependencySet>
@@ -96,7 +105,7 @@
<dependencySet>
<unpack>true</unpack>
<includes>
- <include>org.jboss.jbossas:jboss-as-jmx</include>
+ <include>org.jboss.mx:jboss-jmx</include>
</includes>
<unpackOptions>
<excludes>
Deleted: trunk/console/src/assembly/console-client.xml
===================================================================
--- trunk/console/src/assembly/console-client.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/console/src/assembly/console-client.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -1,16 +0,0 @@
-<assembly>
- <id>console-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*Exception*.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Added: trunk/console/src/assembly/console-mgr-sar.xml
===================================================================
--- trunk/console/src/assembly/console-mgr-sar.xml (rev 0)
+++ trunk/console/src/assembly/console-mgr-sar.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -0,0 +1,31 @@
+<assembly>
+ <id>console-mgr-sar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>target/${project.build.finalName}-console-mgr-classes.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>console-mgr-classes.jar</destName>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/console-mgr.sar</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>jfree:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/console/src/assembly/console-mgr-sar.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/console/src/assembly/jboss-console-client.xml (from rev 85301, trunk/console/src/assembly/console-client.xml)
===================================================================
--- trunk/console/src/assembly/jboss-console-client.xml (rev 0)
+++ trunk/console/src/assembly/jboss-console-client.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-console-client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*Exception*.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/console/src/assembly/jboss-console-client.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Added: trunk/console/src/assembly/jboss-console.xml
===================================================================
--- trunk/console/src/assembly/jboss-console.xml (rev 0)
+++ trunk/console/src/assembly/jboss-console.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>jboss-console</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/console/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/console/src/assembly/jboss-console.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/console/src/assembly/web-console.xml
===================================================================
--- trunk/console/src/assembly/web-console.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/console/src/assembly/web-console.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -13,4 +13,11 @@
</includes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>target/${project.build.finalName}-applet.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>applet.jar</destName>
+ </file>
+ </files>
</assembly>
\ No newline at end of file
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/ejb3/pom.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -28,7 +28,7 @@
<execution>
<id>assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
</execution>
Deleted: trunk/hibernate-int/component-info.xml
===================================================================
--- trunk/hibernate-int/component-info.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/hibernate-int/component-info.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -1,11 +0,0 @@
-<project name="hibernate-int-component-info">
- <component id="hibernate-int"
- module="hibernate"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-hibernate.jar"/>
- <export>
- <include input="jboss-hibernate.jar"/>
- </export>
- </component>
-</project>
\ No newline at end of file
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/hibernate-int/pom.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -12,9 +12,64 @@
<name>JBoss Application Server Hibernate Integration</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (hibernate-int module)</description>
+
<build>
<sourceDirectory>src/main</sourceDirectory>
+ <plugins>
+ <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>
+
+ <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}/jboss-hibernate.jar"/>
+
+ </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>
<!-- Compile (global dependencies) -->
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/pom.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -396,33 +396,6 @@
</modules>
</profile>
- <!-- This profile is used by the ant/buildmagic build -->
- <profile>
- <id>integrated-build</id>
- <modules>
- <module>component-matrix</module>
- <module>main</module>
- <module>system</module>
- <module>system-jmx</module>
- <module>security</module>
- <module>server</module>
- <module>deployment</module>
- <module>jbossas</module>
- <module>jmx-remoting</module>
- <module>messaging</module>
- <module>cluster</module>
- <module>varia</module>
- <module>iiop</module>
- <module>aspects</module>
- <module>profileservice</module>
- <module>connector</module>
- <module>management</module>
- <module>ejb3</module>
- <module>tomcat</module>
- <module>webservices</module>
- </modules>
- </profile>
-
</profiles>
</project>
Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
+++ trunk/spring-int/pom.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -27,6 +27,75 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <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>
+
+ <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}/jboss-spring.jar"/>
+ <copy file="target/${project.build.finalName}-jboss-spring-deployer.jar"
+ tofile="${output.lib}/jboss-spring.deployer"/>
+
+ </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>
Added: trunk/spring-int/src/assembly/jboss-spring-deployer.xml
===================================================================
--- trunk/spring-int/src/assembly/jboss-spring-deployer.xml (rev 0)
+++ trunk/spring-int/src/assembly/jboss-spring-deployer.xml 2009-03-05 21:43:16 UTC (rev 85362)
@@ -0,0 +1,31 @@
+<assembly>
+ <id>jboss-spring-deployer</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources</directory>
+ <outputDirectory>/META-INF</outputDirectory>
+ <includes>
+ <include>*-jboss-beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/${project.build.finalName}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>jboss-spring.jar</destName>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.springframework:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/spring-int/src/assembly/jboss-spring-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list