[jboss-cvs] JBossAS SVN: r87677 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 22 12:37:09 EDT 2009
Author: pgier
Date: 2009-04-22 12:37:08 -0400 (Wed, 22 Apr 2009)
New Revision: 87677
Removed:
trunk/deployment/src/etc/default.mf
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/deployment/pom.xml
trunk/pom.xml
trunk/server/pom.xml
Log:
[JBBUILD-520] Remove intermediate build directory for deployment and server.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/build/build-distr.xml 2009-04-22 16:37:08 UTC (rev 87677)
@@ -420,7 +420,7 @@
<target name="_module-server-most">
<property name="_module.name" value="server" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
<!-- Copy the security-policies-service.xml -->
<copy todir="${install.server}/all/deploy" filtering="no">
@@ -432,38 +432,37 @@
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss.jar"/>
- <include name="jboss-metamodel.jar"/>
- <include name="jmx-adaptor-plugin.jar"/>
- </fileset>
- </copy>
-
+
+ <copy file="${_module.output}/jboss-as-server-jboss.jar"
+ tofile="${install.all.lib}/jboss.jar" filtering="no"/>
+
+ <copy file="${_module.output}/jboss-as-server-jmx-adaptor-plugin.jar"
+ tofile="${install.all.lib}/jmx-adaptor-plugin.jar" filtering="no"/>
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="*-client.jar"/>
- </fileset>
- </copy>
-
+
+ <copy file="${_module.output}/jboss-as-server-client.jar"
+ tofile="${install.client}/jboss-client.jar" filtering="no"/>
+
+ <copy file="${_module.output}/jboss-as-server-jmx-invoker-adaptor-client.jar"
+ tofile="${install.client}/jmx-invoker-adaptor-client.jar" filtering="no"/>
+
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
<fileset dir="${_module.output}/bin">
<include name="**/*"/>
</fileset>
- <fileset dir="${_module.output}/lib">
- <include name="deployer.jar"/>
- <include name="shutdown.jar"/>
- </fileset>
</copy>
<chmod perm="+x">
<fileset dir="${install.bin}">
<include name="**/*.sh"/>
</fileset>
</chmod>
+
+ <copy file="${_module.output}/jboss-as-server-shutdown.jar"
+ tofile="${install.bin}/shutdown.jar" filtering="no"/>
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
@@ -494,10 +493,9 @@
</fileset>
<!-- Deployable archives -->
- <fileset dir="${_module.output}/lib">
+ <fileset dir="${_module.output}">
<include name="uuid-key-generator.sar/**"/>
<include name="sqlexception-service.xml"/>
- <include name="client-deployer-service.xml"/>
</fileset>
</copy>
@@ -1448,15 +1446,13 @@
<target name="_module-deployment-most">
<property name="_module.name" value="deployment" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-jsr88.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-deployment-jboss-jsr88.jar"
+ tofile="${install.all.lib}/jboss-jsr88.jar" filtering="no"/>
+
<copy todir="${install.all.deploy}" filtering="no">
<fileset dir="${_module.output}/etc">
<include name="jsr88-service.xml"/>
@@ -1465,11 +1461,8 @@
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-deployment.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-deployment.jar"
+ tofile="${install.client}/jboss-deployment.jar" filtering="no"/>
</target>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/build/build.xml 2009-04-22 16:37:08 UTC (rev 87677)
@@ -707,7 +707,7 @@
<mkdir dir="${install.default.lib}"/>
<copy todir="${install.default.conf}" overwrite="true">
- <fileset dir="${project.root}/server/output/etc/conf/default"/>
+ <fileset dir="${project.root}/server/target/etc/conf/default"/>
</copy>
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
@@ -734,7 +734,7 @@
</fileset>
</copy>
<copy todir="${install.minimal.conf}" overwrite="true">
- <fileset dir="${project.root}/server/output/etc/conf/minimal" />
+ <fileset dir="${project.root}/server/target/etc/conf/minimal" />
</copy>
<copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml"
todir="${install.minimal.deploy}" overwrite="true"/>
@@ -744,8 +744,8 @@
<include name="log4j.jar" />
</fileset>
</copy>
- <copy todir="${install.minimal.lib}"
- file="${project.root}/server/output/lib/jboss-minimal.jar" />
+ <copy file="${project.root}/server/target/jboss-as-server-jboss-minimal.jar"
+ tofile="${install.minimal.lib}/jboss-minimal.jar"/>
<!-- Build server/web manually -->
<mkdir dir="${install.web}"/>
@@ -755,7 +755,7 @@
<include name="**"/>
<exclude name="jboss-service.xml"/>
</fileset>
- <fileset dir="${project.root}/server/output/etc/conf/web">
+ <fileset dir="${project.root}/server/target/etc/conf/web">
<include name="jboss-service.xml"/>
</fileset>
</copy>
@@ -785,7 +785,7 @@
<!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
<include name="ejb3-container-jboss-beans.xml"/>
</fileset>
- <fileset dir="${project.root}/server/output/etc/conf/web">
+ <fileset dir="${project.root}/server/target/etc/conf/web">
<include name="jmx-invoker-service.xml"/>
</fileset>
<fileset dir="${project.root}/profileservice/output/resources/">
@@ -825,13 +825,13 @@
</copy>
<!-- install descriptor overrides -->
<copy todir="${install.standard.conf}">
- <fileset dir="${project.root}/server/output/etc/conf/standard">
+ <fileset dir="${project.root}/server/target/etc/conf/standard">
<include name="jboss-service.xml"/>
<include name="jndi.properties"/>
</fileset>
</copy>
<copy todir="${install.standard.deployers}">
- <fileset dir="${project.root}/server/output/etc/conf/standard">
+ <fileset dir="${project.root}/server/target/etc/conf/standard">
<include name="ear-deployer-jboss-beans.xml"/>
</fileset>
</copy>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/deployment/pom.xml 2009-04-22 16:37:08 UTC (rev 87677)
@@ -14,6 +14,7 @@
<description>JBoss Application Server (deployment module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -66,44 +67,18 @@
<configuration>
<tasks>
- <mkdir dir="output/etc"/>
- <copy todir="output/etc" filtering="yes">
+ <mkdir dir="target/etc"/>
+ <copy todir="target/etc" filtering="yes">
<fileset dir="src/etc">
<include name="**"/>
</fileset>
</copy>
- <mkdir dir="output/lib"/>
- <copy file="target/${artifactId}-${version}.jar"
- tofile="output/lib/jboss-deployment.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-jsr88.jar"
- tofile="output/lib/jboss-jsr88.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>
Deleted: trunk/deployment/src/etc/default.mf
===================================================================
--- trunk/deployment/src/etc/default.mf 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/deployment/src/etc/default.mf 2009-04-22 16:37:08 UTC (rev 87677)
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Specification-Title: J2EE Deployment API
-Specification-Vendor: Sun Microsystems, Inc.
-Specification-Version: 1.1
-Implementation-Title: JBoss JSR-88 Deployment API
-Implementation-Vendor: JBoss Inc.
-Implementation-Version: 1.1-DEV
-J2EE-DeploymentFactory-Implementation-Class: org.jboss.deployment.spi.factories.DeploymentFactoryImpl
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/pom.xml 2009-04-22 16:37:08 UTC (rev 87677)
@@ -116,7 +116,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-04-22 15:55:45 UTC (rev 87676)
+++ trunk/server/pom.xml 2009-04-22 16:37:08 UTC (rev 87677)
@@ -14,6 +14,7 @@
<description>JBoss Application Server (server module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -160,7 +161,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>create-output</id>
+ <id>ant-run</id>
<goals>
<goal>run</goal>
</goals>
@@ -168,20 +169,9 @@
<configuration>
<tasks>
- <!-- Need to copy classes here because varia module
- - depends on copying some of these classes.
- - TODO: this can be removed after varia switches to maven.
- -->
- <mkdir dir="output/classes"/>
- <copy todir="output/classes">
- <fileset dir="target/classes">
- <include name="**"/>
- </fileset>
- </copy>
-
<filter token="default.type.mapping" value="Hypersonic SQL"/>
- <property name="build.bin" value="output/bin"/>
+ <property name="build.bin" value="target/bin"/>
<mkdir dir="${build.bin}"/>
<copy todir="${build.bin}" filtering="no">
<fileset dir="src/bin">
@@ -203,22 +193,22 @@
</fileset>
</chmod>
- <mkdir dir="output/etc"/>
- <copy todir="output/etc" filtering="yes">
+ <mkdir dir="target/etc"/>
+ <copy todir="target/etc" filtering="yes">
<fileset dir="src/etc">
<include name="**"/>
<exclude name="manifest/**"/>
</fileset>
</copy>
- <mkdir dir="output/resources"/>
- <copy todir="output/resources" filtering="yes">
+ <mkdir dir="target/resources"/>
+ <copy todir="target/resources" filtering="yes">
<fileset dir="src/resources">
<include name="**"/>
</fileset>
</copy>
- <property name="build.lib" value="output/lib"/>
+ <!--<property name="build.lib" value="output/lib"/>
<mkdir dir="${build.lib}"/>
<copy file="target/${artifactId}-${version}-client.jar"
tofile="${build.lib}/jboss-client.jar"/>
@@ -235,11 +225,11 @@
<copy file="target/${artifactId}-${version}-testsuite-support.jar"
tofile="${build.lib}/testsuite-support.jar"/>
<copy file="target/${artifactId}-${version}-verifier.jar"
- tofile="${build.lib}/verifier.jar"/>
+ tofile="${build.lib}/verifier.jar"/>-->
<!-- uuid-key-generator.sar -->
- <mkdir dir="${build.lib}/uuid-key-generator.sar"/>
- <copy todir="${build.lib}/uuid-key-generator.sar">
+ <mkdir dir="target/uuid-key-generator.sar"/>
+ <copy todir="target/uuid-key-generator.sar">
<fileset dir="target/classes">
<include name="org/jboss/ejb/plugins/keygenerator/uuid/**"/>
</fileset>
@@ -252,8 +242,8 @@
</copy>
<!-- SQLException Processor -->
- <copy todir="${build.lib}"
- file="output/resources/exception-processor/sqlexception-service.xml"/>
+ <copy todir="target"
+ file="target/resources/exception-processor/sqlexception-service.xml"/>
</tasks>
</configuration>
More information about the jboss-cvs-commits
mailing list