Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1784 - in trunk/labs/jbossbuild/projects/jboss: . build dist mbeans
|
From: <jbo...@li...> - 2005-12-12 15:52:39
|
Author: rl...@jb...
Date: 2005-12-12 10:52:36 -0500 (Mon, 12 Dec 2005)
New Revision: 1784
Added:
trunk/labs/jbossbuild/projects/jboss/dist/
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
Modified:
trunk/labs/jbossbuild/projects/jboss/build/pom.xml
trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/build/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/build/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/build/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -5,6 +5,9 @@
<artifactId>app</artifactId>
<name>server</name>
<packaging>pom</packaging>
+
+ <!-- define a list of modules which we will need to build in addition
+ to the current one -->
<modules>
<module>../common</module>
<module>../j2se</module>
@@ -19,60 +22,70 @@
<module>../aop</module>
<module>../j2ee</module>
<module>../transaction</module>
- <module>../server</module>
+ <module>../server</module>
+ <module>../dist</module>
</modules>
-
-
- <build>
+ <!-- describe the build process -->
+ <build>
+ <!--a plugin is how achieve a unit of work, a build is made up a series of plugins -->
+ <plugins>
+ <!-- define a custom clean plugin and configure it to include the cleaning
+ of an additional directory
+
+ because this is a top level build, the plugins we define here will be inherited
+ by the builds in the child modules -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.0-jboss</version>
+ <configuration>
+ <additionalDirs>
+ <additionalDir>${basedir}/output</additionalDir>
+ </additionalDirs>
+ </configuration>
+ </plugin>
-
-
- <!--define the regular list of plugins -->
-
- <plugins>
- <plugin>
-
- <artifactId>maven-clean-plugin</artifactId>
+ <!-- define how we want compilation to take place
+ here, we accept most of the defaults but say that we want the
+ optimization flag set, and define the source and target to be 1.4,
+ these setting will be inherited by child projects -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <additionalDirs>
- <additionalDir>${basedir}/output</additionalDir>
- </additionalDirs>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <inherited>false</inherited>
- <id>builddist</id>
- <phase>package</phase>
- <configuration>
- <tasks>
-
- <echo message="basedir is ${basedir}"/>
- <mkdir dir="${basedir}/jboss-${version}"/>
- <mkdir dir="${basedir}/jboss-${version}/bin"/>
- <mkdir dir="${basedir}/jboss-${version}/client"/>
- <mkdir dir="${basedir}/jboss-${version}/docs"/>
- <mkdir dir="${basedir}/jboss-${version}/lib"/>
- <mkdir dir="${basedir}/jboss-${version}/server"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
-
-
-
+ </plugin>
</plugins>
-
</build>
-
+ <!-- define the repository we wish to use -->
+ <!-- by giving it the id of central -->
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
+ <!-- define the plugin repository we wish to use -->
+ <!-- notice, we turn off the automatic update of items with SNAPSHOT -->
+ <!-- versions. It's very slow, they will only be downloaded if they do -->
+ <!-- not exist locally-->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss plugin repo</id>
+ <name>jboss plugin repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
Added: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -0,0 +1,275 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.server.dist</groupId>
+ <version>5.0-SNAPSHOT</version>
+ <artifactId>jboss-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Server Distribution Project</name>
+ <description>JBoss Server Distribution Project</description>
+ <parent>
+ <artifactId>app</artifactId>
+ <groupId>org.jboss.server</groupId>
+ <version>5.0-SNAPSHOT</version>
+ </parent>
+ <build>
+
+ <plugins>
+ <!-- define a custom clean plugin and configure it to include the cleaning
+ of an additional directory -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <additionalDirs>
+ <additionalDir>${basedir}/jboss-${version}</additionalDir>
+ </additionalDirs>
+ </configuration>
+ </plugin>
+
+ <!-- define a plugin that executes during the package phase
+ to create our distribution, note that this plugin will
+ not be inherited by child modules -->
+
+ <!-- match the buildmagic output for a jboss distribution
+ this can later be replace with an official plugin
+ which defines the output schema in an official manner
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>builddist</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <echo message="Building the jboss distribution"/>
+
+ <mkdir dir="${basedir}/jboss-${version}"/>
+ <mkdir dir="${basedir}/jboss-${version}/bin"/>
+ <mkdir dir="${basedir}/jboss-${version}/client"/>
+ <mkdir dir="${basedir}/jboss-${version}/docs"/>
+ <mkdir dir="${basedir}/jboss-${version}/lib"/>
+ <mkdir dir="${basedir}/jboss-${version}/lib/endorsed"/>
+ <mkdir dir="${basedir}/jboss-${version}/server"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/conf"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/deploy"/> \
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/lib"/>
+
+ <!-- handle items going in the bin dir -->
+ <copy todir="${basedir}/jboss-${version}/bin" filtering="no">
+ <fileset dir="../server/src/bin">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="../server/output/lib">
+ <include name="deployer.jar"/>
+ <include name="shutdown.jar"/>
+ </fileset>
+ <fileset dir="../system/src/bin">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="../system/output/lib">
+ <include name="run.jar"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="+x">
+ <fileset dir="${basedir}/jboss-${version}/bin">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- move artifacts to lib dir -->
+ <copy todir="${basedir}/jboss-${version}/lib" filtering="no">
+ <fileset dir="../common/output/lib">
+ <include name="jboss-common.jar"/>
+ <include name="namespace.jar"/>
+ </fileset>
+ <fileset dir="../j2se/output/lib">
+ <include name="jboss-j2se.jar"/>
+ </fileset>
+ <fileset dir="../mbeans/output/lib">
+ <include name="jboss-mbeans.jar"/>
+ </fileset>
+ <fileset dir="../jmx/output/lib">
+ <include name="jboss-jmx.jar"/>
+ </fileset>
+ <fileset dir="../system/output/lib">
+ <include name="jboss-system.jar"/>
+ <include name="log4j-boot.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- move artifacts to minimal/lib -->
+ <copy todir="${basedir}/jboss-${version}/server/minimal/lib" filtering="no">
+ <!--<fileset dir="../management/output/lib">
+ <include name="jboss-management.jar"/>
+ </fileset>-->
+ <fileset dir="../naming/output/lib">
+ <include name="jnpserver.jar"/>
+ </fileset>
+ <fileset dir="../server/output/lib">
+ <include name="jboss-minimal.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- move artifacts to minimal/conf -->
+
+ <copy file="../server/src/etc/conf/default/jboss-minimal.xml"
+ tofile="${basedir}/jboss-${version}/server/minimal/conf/jboss-service.xml"/>
+ <copy todir="${basedir}/jboss-${version}/server/minimal/conf">
+ <fileset dir="../server/src/etc/conf/default">
+ <include name="jndi.properties" />
+ <include name="log4j.xml" />
+ </fileset>
+ </copy>
+
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.stchome.maven.plugins</groupId>
+ <artifactId>artifact-utils</artifactId>
+ <executions>
+ <execution>
+ <id>copyfiles</id>
+ <phase>package</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <rename>commons-httpclient.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <rename>commons-logging.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ <type>jar</type>
+ <rename>concurrent.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.5</version>
+ <type>jar</type>
+ <rename>dom4j.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ <version>1.0.10</version>
+ <type>jar</type>
+ <rename>getopt.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>gnu-regexp</groupId>
+ <artifactId>gnu-regexp</artifactId>
+ <version>1.1.14</version>
+ <type>jar</type>
+ <rename>gnu-regexp.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-4</version>
+ <type>jar</type>
+ <rename>jaxen.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <rename>webdavlib.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>resolver</artifactId>
+ <version>2.7.0.</version>
+ <type>jar</type>
+ <rename>resolver.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.0</version>
+ <type>jar</type>
+ <rename>xercesImpl.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.7.0</version>
+ <type>jar</type>
+ <rename>xml-apis.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>j_2.6.0</version>
+ <type>jar</type>
+ <rename>xalan.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <type>jar</type>
+ <rename>log4j.jar</rename>
+ <location>${basedir}/jboss-${version}/server/minimal/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <clean>true</clean>
+ <defaultWorkDirectory>output/workdir</defaultWorkDirectory>
+ </configuration>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -66,7 +66,6 @@
<version>5.0-SNAPSHOT</version>
</dependency>
- <!--fix me with jboss version -->
<dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
|
