[jboss-cvs] JBossAS SVN: r87830 - in trunk: console and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 16:52:45 EDT 2009
Author: pgier
Date: 2009-04-24 16:52:45 -0400 (Fri, 24 Apr 2009)
New Revision: 87830
Removed:
trunk/webservices/src/etc/
Modified:
trunk/build/build-distr.xml
trunk/console/pom.xml
trunk/hibernate-int/pom.xml
trunk/management/pom.xml
trunk/spring-int/pom.xml
trunk/testsuite/imports/sections/jsr77.xml
trunk/tomcat/pom.xml
trunk/tools/etc/buildmagic/modules.ent
trunk/webservices/pom.xml
Log:
[JBBUILD-520] Remove intermediate build directory for console, hibernate, management, spring-int, tomcat, webservices.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/build/build-distr.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1150,8 +1150,8 @@
<target name="_module-tomcat-most">
<property name="_module.name" value="tomcat" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- <property name="_module.ext" override="true" value="${project.root}/${_module.name}/ext"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/target"/>
+ <!--<property name="_module.ext" override="true" value="${project.root}/${_module.name}/ext"/>-->
<!-- Copy the thirdparty libraries -->
<mkdir dir="${install.all.lib}"/>
@@ -1286,32 +1286,24 @@
<target name="_module-management-most">
<property name="_module.name" value="management" 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-jsr77.jar"/>
- <include name="jboss-management.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-management.jar"
+ tofile="${install.all.lib}/jboss-management.jar" filtering="no" />
+ <copy file="${_module.output}/jboss-as-management-jsr77.jar"
+ tofile="${install.all.lib}/jboss-jsr77.jar" filtering="no" />
<mkdir dir="${install.examples}/jmx"/>
- <copy todir="${install.examples}/jmx" filtering="no">
- <!-- Deployable archives -->
- <fileset dir="${_module.output}/lib">
- <include name="ejb-management.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-management-ejb-management.jar"
+ tofile="${install.examples}/jmx/ejb-management.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="jboss-jsr77-client.jar"/>
- </fileset>
- </copy>
+ <copy file="${_module.output}/jboss-as-management-jsr77-client.jar"
+ tofile="${install.client}/jboss-jsr77-client.jar" filtering="no" />
+
</target>
<target name="_module-management-all" depends="_module-management-most">
@@ -1338,7 +1330,7 @@
<target name="_module-console-most">
<property name="_module.name" value="console" 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 scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
@@ -1346,10 +1338,9 @@
<fileset dir="${_module.output}/bin">
<include name="**/*"/>
</fileset>
- <fileset dir="${_module.output}/lib">
- <include name="twiddle.jar"/>
- </fileset>
</copy>
+ <copy file="${_module.output}/jboss-as-console-twiddle.jar"
+ tofile="${install.bin}/twiddle.jar" filtering="no" />
<chmod perm="+x">
<fileset dir="${install.bin}">
<include name="**/*.sh"/>
@@ -1364,8 +1355,10 @@
</copy>
<!-- Unpack the plugin manager SAR (embedded) and application WAR -->
- <unjar src="${_module.output}/lib/console-mgr.sar" dest="${install.all.deploy}/management/console-mgr.sar"/>
- <unjar src="${_module.output}/lib/web-console.war" dest="${install.all.deploy}/management/console-mgr.sar/web-console.war"/>
+ <unjar src="${_module.output}/jboss-as-console-console-mgr-sar.jar"
+ dest="${install.all.deploy}/management/console-mgr.sar"/>
+ <unjar src="${_module.output}/jboss-as-console-web-console.war"
+ dest="${install.all.deploy}/management/console-mgr.sar/web-console.war"/>
</target>
@@ -1460,7 +1453,7 @@
<target name="_module-webservices-most">
<property name="_module.name" value="webservices" 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"/>
<available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
<antcall target="extract-jbossws-resources"/>
@@ -1499,10 +1492,10 @@
<target name="install-jbossws-to-client">
<!-- Install JBossWS jars to client directory -->
+ <copy file="${_module.output}/jboss-as-webservices.jar"
+ tofile="${install.client}/jbossws-jboss60.jar" filtering="no" />
+
<copy todir="${install.client}" flatten="true" overwrite="true">
- <fileset dir="${_module.output}/lib">
- <include name="jbossws-jboss60.jar"/>
- </fileset>
<fileset dir="${org.jboss.ws.native.lib}">
<include name="jbossws-native-client.jar"/>
<include name="jbossws-native-core.jar"/>
@@ -1572,7 +1565,8 @@
<target name="install-jbossws-to-deployers">
<!-- Install JBossWS deployers, runtime jars and configs -->
<mkdir dir="${install.all.deployers}/jbossws.deployer"/>
- <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss60-deployer.zip"/>
+ <unzip dest="${install.all.deployers}/jbossws.deployer"
+ src="${_module.output}/jboss-as-webservices-jbossws-jboss60-deployer.zip"/>
<copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
<fileset dir="${sun.fi.lib}">
<include name="FastInfoset.jar"/>
@@ -1638,15 +1632,13 @@
<target name="_module-hibernate-int-most">
<property name="_module.name" value="hibernate-int" 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"/>
<mkdir dir="${install.all.lib}"/>
<!-- The hibernate-int module output -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib" includes="*.jar"
- excludes="*-sources.jar, *-javadoc.jar"/>
- </copy>
+ <copy file="${_module.output}/jboss-as-hibernate-int.jar"
+ todir="${install.all.lib}/" filtering="no" />
<!-- The hibernate jar -->
<copy todir="${install.all.lib}" filtering="no">
@@ -1753,6 +1745,10 @@
</copy>
</target>
+ <!-- ============================================================== -->
+ <!-- Thirdparty dependencies consumed directly from the repository -->
+ <!-- ============================================================== -->
+
<target name="thirdparty">
<!-- Copy thirdparty libraries -->
<mkdir dir="${install.all.lib}"/>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/console/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-console</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server Console</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (console module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -70,7 +74,7 @@
<configuration>
<tasks>
- <property name="output.bin" location="output/bin"/>
+ <property name="output.bin" location="target/bin"/>
<mkdir dir="${output.bin}"/>
<copy todir="${output.bin}" filtering="yes">
<fileset dir="src/bin">
@@ -78,7 +82,7 @@
</fileset>
</copy>
- <property name="output.resources" location="output/resources"/>
+ <property name="output.resources" location="target/resources"/>
<mkdir dir="${output.resources}"/>
<copy todir="${output.resources}" filtering="yes">
<fileset dir="src/resources">
@@ -86,54 +90,14 @@
</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>
<!-- Compile (global dependencies) -->
<dependency>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/hibernate-int/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-hibernate-int</artifactId>
@@ -14,6 +16,7 @@
<description>JBoss Application Server (hibernate-int module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -29,19 +32,13 @@
<configuration>
<tasks>
- <property name="output.resources" location="output/resources"/>
- <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="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>
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/management/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-management</artifactId>
@@ -14,6 +16,7 @@
<description>JBoss Application Server (management module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -78,49 +81,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>
- <property name="output.lib" location="output/lib"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${project.build.finalName}.jar"
- tofile="${output.lib}/jboss-management.jar"/>
- <copy file="target/${project.build.finalName}-ejb-management.jar"
- tofile="${output.lib}/ejb-management.jar"/>
- <copy file="target/${project.build.finalName}-jsr77.jar"
- tofile="${output.lib}/jboss-jsr77.jar"/>
- <copy file="target/${project.build.finalName}-jsr77-client.jar"
- tofile="${output.lib}/jboss-jsr77-client.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>
Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/spring-int/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-spring-int</artifactId>
@@ -14,6 +16,7 @@
<description>JBoss Application Server (spring-int module)</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<plugins>
<plugin>
@@ -56,7 +59,7 @@
<configuration>
<tasks>
- <property name="output.resources" location="output/resources"/>
+ <property name="output.resources" location="target/resources"/>
<mkdir dir="${output.resources}"/>
<copy todir="${output.resources}" filtering="yes">
<fileset dir="src/resources">
@@ -64,38 +67,11 @@
</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>
Modified: trunk/testsuite/imports/sections/jsr77.xml
===================================================================
--- trunk/testsuite/imports/sections/jsr77.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/testsuite/imports/sections/jsr77.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -4,7 +4,7 @@
<mkdir dir="${build.lib}"/>
<!-- Copy the ejb connector -->
- <copy file="${jboss.management.lib}/ejb-management.jar"
- todir="${build.lib}"/>
+ <copy file="${jboss.management.lib}/jboss-as-management-ejb-management.jar"
+ tofile="${build.lib}/ejb-management.jar"/>
</target>
</project>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/tomcat/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
@@ -12,7 +14,9 @@
<name>JBoss Application Server Tomcat</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (tomcat module)</description>
+
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
@@ -53,14 +57,14 @@
<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>
- <property name="output.resources" location="output/resources"/>
+ <property name="output.resources" location="target/resources"/>
<mkdir dir="${output.resources}"/>
<copy todir="${output.resources}" filtering="yes">
<fileset dir="src/resources">
@@ -68,7 +72,7 @@
</fileset>
</copy>
- <property name="output.deploy" location="output/deploy"/>
+ <property name="output.deploy" location="target/deploy"/>
<mkdir dir="${output.deploy}"/>
<copy todir="${output.deploy}">
<fileset dir="src/webapps">
@@ -76,10 +80,10 @@
</fileset>
</copy>
- <property name="output.lib" location="output/lib"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${project.build.finalName}-jbossweb-cluster-aop.jar"
- tofile="${output.lib}/jbossweb-cluster.aop"/>
+ <property name="output.lib" location="target"/>
+ <!--<mkdir dir="${output.lib}"/>
+ <copy file="${output.lib}/${project.build.finalName}-jbossweb-cluster-aop.jar"
+ tofile="${output.lib}/jbossweb-cluster.aop"/>-->
<mkdir dir="${output.deploy}/jboss-web.deployer/META-INF"/>
@@ -149,28 +153,9 @@
</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/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/tools/etc/buildmagic/modules.ent 2009-04-24 20:52:45 UTC (rev 87830)
@@ -15,12 +15,12 @@
</path>
<!-- tomcat -->
-<property name="jboss.tomcat.root" value="${project.root}/tomcat/output"/>
- <property name="jboss.tomcat.lib" value="${jboss.tomcat.root}/lib"/>
+<property name="jboss.tomcat.root" value="${project.root}/tomcat/"/>
+ <property name="jboss.tomcat.lib" value="${jboss.tomcat.root}/target"/>
<path id="jboss.tomcat.classpath">
- <pathelement path="${jboss.tomcat.lib}/jbossweb-cluster.aop"/>
- <pathelement path="${jboss.tomcat.root}/resource"/>
- <pathelement path="${jboss.tomcat.root}/deploy/jbossweb.sar/jboss-web-service.jar"/>
+ <pathelement path="${jboss.tomcat.lib}/target/jbossweb-cluster.aop"/>
+ <pathelement path="${jboss.tomcat.root}/target/resource"/>
+ <pathelement path="${jboss.tomcat.root}/target/deploy/jbossweb.sar/jboss-web-service.jar"/>
</path>
<!-- Cluster -->
@@ -86,12 +86,12 @@
</path>
<!-- Management -->
-<property name="jboss.management.root" value="${project.root}/management/output"/>
-<property name="jboss.management.lib" value="${jboss.management.root}/lib"/>
+<property name="jboss.management.root" value="${project.root}/management/"/>
+<property name="jboss.management.lib" value="${jboss.management.root}/target"/>
<path id="jboss.management.classpath">
- <pathelement path="${jboss.management.lib}/jboss-jsr77-client.jar"/>
- <pathelement path="${jboss.management.lib}/jboss-jsr77.jar"/>
- <pathelement path="${jboss.management.lib}/jboss-management.jar"/>
+ <pathelement path="${jboss.management.lib}/jboss-as-management-jsr77-client.jar"/>
+ <pathelement path="${jboss.management.lib}/jboss-as-management-jsr77.jar"/>
+ <pathelement path="${jboss.management.lib}/jboss-as-management.jar"/>
</path>
<!-- ProfileService -->
@@ -117,10 +117,10 @@
</path>
<!-- Spring -->
-<property name="jboss.spring.root" value="${project.root}/spring-int/output"/>
-<property name="jboss.spring.lib" value="${jboss.spring.root}/lib"/>
+<property name="jboss.spring.root" value="${project.root}/spring-int"/>
+<property name="jboss.spring.lib" value="${jboss.spring.root}/target"/>
<path id="jboss.spring.classpath">
- <pathelement path="${jboss.spring.lib}/jboss-spring.jar"/>
+ <pathelement path="${jboss.spring.lib}/jboss-as-spring-int.jar"/>
</path>
<!-- System -->
@@ -145,15 +145,15 @@
</path>
<!-- Webservices -->
-<property name="jboss.webservices.root" value="${project.root}/webservices/output"/>
-<property name="jboss.webservices.lib" value="${jboss.webservices.root}/lib"/>
+<property name="jboss.webservices.root" value="${project.root}/webservices"/>
+<property name="jboss.webservices.lib" value="${jboss.webservices.root}/target"/>
<path id="jboss.webservices.classpath">
- <pathelement path="${jboss.webservices.root}/classes"/>
+ <pathelement path="${jboss.webservices.lib}/jboss-as-webservices.jar"/>
</path>
<!-- Hibernate2 integration module -->
-<property name="jboss.hibernate.root" value="${project.root}/hibernate-int/output"/>
-<property name="jboss.hibernate.lib" value="${jboss.hibernate.root}/lib"/>
+<property name="jboss.hibernate.root" value="${project.root}/hibernate-int"/>
+<property name="jboss.hibernate.lib" value="${jboss.hibernate.root}/target"/>
<path id="jboss.hibernate.classpath">
- <pathelement path="${jboss.hibernate.lib}/jboss-hibernate.jar"/>
+ <pathelement path="${jboss.hibernate.lib}/jboss-as-hibernate-int.jar"/>
</path>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2009-04-24 19:34:32 UTC (rev 87829)
+++ trunk/webservices/pom.xml 2009-04-24 20:52:45 UTC (rev 87830)
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
@@ -13,10 +15,9 @@
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (webservices module)</description>
- <!-- Plugins -->
<build>
- <sourceDirectory>src/main</sourceDirectory>
<finalName>${artifactId}</finalName>
+ <sourceDirectory>src/main</sourceDirectory>
<resources>
<resource>
<directory>src/resources/jbossws-jboss60.jar</directory>
@@ -51,54 +52,18 @@
<configuration>
<tasks>
- <mkdir dir="output/etc"/>
- <copy todir="output/etc" filtering="yes">
- <fileset dir="src/etc">
- <include name="**"/>
- </fileset>
- </copy>
-
- <property name="output.resources" location="output/resources"/>
- <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="output.lib" location="output/lib"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${project.build.finalName}.jar"
- tofile="${output.lib}/jbossws-jboss60.jar"/>
- <copy file="target/${project.build.finalName}-jbossws-jboss60-deployer.zip"
- tofile="${output.lib}/jbossws-jboss60-deployer.zip"/>
-
-
+
</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>
More information about the jboss-cvs-commits
mailing list