[jboss-cvs] JBossAS SVN: r92149 - in branches/Branch_5_x: main and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 7 14:47:38 EDT 2009
Author: pgier
Date: 2009-08-07 14:47:37 -0400 (Fri, 07 Aug 2009)
New Revision: 92149
Removed:
branches/Branch_5_x/main/src/assembly/client.xml
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/main/build.xml
branches/Branch_5_x/main/pom.xml
Log:
[JBAS-6993] JBoss main client jar is no longer used.
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-08-07 18:45:22 UTC (rev 92148)
+++ branches/Branch_5_x/build/build-distr.xml 2009-08-07 18:47:37 UTC (rev 92149)
@@ -293,14 +293,6 @@
</fileset>
</copy>
- <!-- Copy the generated client -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="*-client.jar"/>
- </fileset>
- </copy>
-
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
Modified: branches/Branch_5_x/main/build.xml
===================================================================
--- branches/Branch_5_x/main/build.xml 2009-08-07 18:45:22 UTC (rev 92148)
+++ branches/Branch_5_x/main/build.xml 2009-08-07 18:47:37 UTC (rev 92149)
@@ -91,12 +91,6 @@
<property name="jar.prefix" value="jboss-main"/>
<property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.5"/>
- <property name="jar.client.includes"
- value="org/jboss/system/server/ServerLoader*.class,
- org/jboss/system/server/Server.class,
- org/jboss/system/server/ServerConfig.class,
- **/*MBean.class"
- />
<call target="_default:task-init"/>
@@ -152,10 +146,6 @@
<fileset dir="${build.classes}"/>
</jar>
- <jar jarfile="${build.lib}/${jar.client.name}" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}" includes="${jar.client.includes}"/>
- </jar>
-
<!-- Inflate out contents of the Bootstrap JAR into a Temp Directory -->
<property name="inflated.spi.dir" value="target/tmp-bootstrap-spi" />
<property name="inflated.spi.as.dir" value="target/tmp-bootstrap-spi-as" />
Modified: branches/Branch_5_x/main/pom.xml
===================================================================
--- branches/Branch_5_x/main/pom.xml 2009-08-07 18:45:22 UTC (rev 92148)
+++ branches/Branch_5_x/main/pom.xml 2009-08-07 18:47:37 UTC (rev 92149)
@@ -27,13 +27,15 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>assembly</id>
+ <id>assemble-log4j-boot</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ <descriptors>
+ <descriptor>src/assembly/log4j-boot.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
<execution>
Deleted: branches/Branch_5_x/main/src/assembly/client.xml
===================================================================
--- branches/Branch_5_x/main/src/assembly/client.xml 2009-08-07 18:45:22 UTC (rev 92148)
+++ branches/Branch_5_x/main/src/assembly/client.xml 2009-08-07 18:47:37 UTC (rev 92149)
@@ -1,19 +0,0 @@
-<assembly>
- <id>client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/system/server/ServerLoader*.class</include>
- <include>org/jboss/system/server/Server.class</include>
- <include>org/jboss/system/server/ServerConfig.class</include>
- <include>**/*MBean.class</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list