[jboss-svn-commits] JBL Code SVN: r29852 - in labs/jbossesb/trunk/product: install and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 28 11:36:35 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-10-28 11:36:34 -0400 (Wed, 28 Oct 2009)
New Revision: 29852
Removed:
labs/jbossesb/trunk/product/install/embedded-console/
labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml
labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml
labs/jbossesb/trunk/product/tools/jonplugin/jonserver/
labs/jbossesb/trunk/product/tools/jonplugin/pom.xml
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/ivy-build.xml
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/ivysettings.xml
labs/jbossesb/trunk/product/tools/jonplugin/build.xml
Log:
Build and install jopr console and plugin: JBESB-2907
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/build.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -146,10 +146,7 @@
<target name="org.jboss.soa.esb.plugin.build" depends="org.jboss.esb.rosetta.compile">
<echo message="Build ESB JON plugin"/>
- <!--
- <ant dir="tools/jonplugin" target="jar-as4-plugin"/>
- <ant dir="tools/jonplugin" target="jar-as5-plugin"/>
- -->
+ <ant dir="tools/jonplugin"/>
</target>
<target name="dependencies.get">
@@ -428,6 +425,7 @@
<ant dir="rosetta" target="clean"/>
<ant dir="contract-web" target="clean"/>
<ant dir="services" target="clean"/>
+ <ant dir="tools/jonplugin" target="clean"/>
<delete dir="${org.jboss.esb.internal.dest}"/>
<delete dir="${org.jboss.esb.internal.dest.root}"/>
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/install/build.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -14,6 +14,10 @@
<property name="server.lib.dir" value="${server.dir}/lib"/>
<property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
+ <property name="jopr.console.dir" location="${deploy.dir}/admin-console.war"/>
+ <property name="jopr.plugin.base" value="rhq-jbossesb-plugin-"/>
+ <property name="jopr.console.base" value="jopr-embedded-"/>
+
<property name="product.dir" location=".."/>
<!-- Are we embedded in a source hierarchy? -->
@@ -60,10 +64,53 @@
</target>
- <target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
+ <target name="dependencies" depends="dependencies.source, dependencies.jbossesb">
+ <condition property="jopr.console.exists">
+ <available file="${jopr.console.dir}"/>
+ </condition>
- <target name="deploy" depends="undeploy, internal.deploy, internal.deploy.jbossas5, deploy.bindings" description="Wrapper for internal.deploy"/>
+ <path id="jopr.as4.plugin">
+ <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.plugin.base}*as4.jar"/>
+ </path>
+ <property name="jopr.as4.plugin" refid="jopr.as4.plugin"/>
+ <path id="jopr.as4.console">
+ <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.console.base}jbas4*.war"/>
+ </path>
+ <property name="jopr.as4.console" refid="jopr.as4.console"/>
+ <path id="jopr.as5.plugin">
+ <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.plugin.base}*as5.jar"/>
+ </path>
+ <property name="jopr.as5.plugin" refid="jopr.as5.plugin"/>
+ <path id="jopr.as5.console">
+ <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.console.base}jbas5*.war"/>
+ </path>
+ <property name="jopr.as5.console" refid="jopr.as5.console"/>
+
+ <condition property="jopr.plugin.jar" value="${jopr.as5.plugin}" else="${jopr.as4.plugin}">
+ <isset property="jbossas5"/>
+ </condition>
+ <condition property="jopr.console.war" value="${jopr.as5.console}" else="${jopr.as4.console}">
+ <isset property="jbossas5"/>
+ </condition>
+ </target>
+
+ <target name="install.base.console" depends="dependencies" unless="jopr.console.exists">
+ <mkdir dir="${jopr.console.dir}"/>
+ <unzip dest="${jopr.console.dir}" src="${jopr.console.war}"/>
+ </target>
+
+ <target name="deploy.console" depends="install.base.console">
+ <path id="plugin.location">
+ <fileset dir="${jopr.console.dir}" includes="**/jopr-jboss-as-*plugin*.jar"/>
+ </path>
+ <property name="plugin.location" refid="plugin.location"/>
+ <dirname property="plugin.dir" file="${plugin.location}"/>
+ <copy todir="${plugin.dir}" file="${jopr.plugin.jar}"/>
+ </target>
+
+ <target name="deploy" depends="undeploy, internal.deploy, internal.deploy.jbossas5, deploy.console, deploy.bindings" description="Wrapper for internal.deploy"/>
+
<target name="check.tomcat.props">
<fail unless="org.jboss.esb.tomcat.home" message="Cannot determine target deployment, please check deployment.properties"/>
</target>
@@ -179,12 +226,6 @@
<copy file="${org.jboss.esb.dist.lib}/jbossws-native-core-3.0.5.GA.jar" tofile="${deploy.dir}/jbossws.sar/jbossws-core.jar"/>
<copy file="${org.jboss.esb.dist.lib}/jbossws-common-1.0.8.GA.jar" tofile="${server.lib.dir}/jbossws-common.jar"/>
- <!-- embedded jopr console -->
- <ant dir="embedded-console" target="install">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
-
<ant dir="jbpm-patch" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
@@ -345,12 +386,6 @@
<copy file="${org.jboss.esb.dist.lib}/scout-1.0.jar" tofile="${client.dir}/scout.jar" overwrite="true"/>
- <!-- embedded jopr console -->
- <ant dir="embedded-console" target="install">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
-
<ant dir="jbpm-patch" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
@@ -370,8 +405,9 @@
<delete dir="${deploy.dir}/soapui-client.sar" quiet="true"/>
<delete file="${deploy.dir}/contract.war" quiet="true"/>
<delete file="${deploy.dir}/esb-console.war" quiet="true" />
- <delete file="${deploy.dir}/jbas4-admin-console.war" quiet="true"/>
- <delete file="${deploy.dir}/jbas5-admin-console.war" quiet="true" />
+ <delete quiet="true">
+ <fileset dir="${deploy.dir}/admin-console.war" includes="**/rhq-jbossesb-plugin-*.jar"/>
+ </delete>
<delete dir="${conf.dir}/action-templates.xml" quiet="true"/>
<delete quiet="false">
<fileset dir="${server.lib.dir}" >
Modified: labs/jbossesb/trunk/product/ivy-build.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy-build.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/ivy-build.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -14,8 +14,8 @@
<ivy:retrieve log="quiet"/>
</target>
- <target name="clean" depends="ivy.init">
- <delete dir="${ivy.lib.dir}" includes="*.jar,ivy-report.css,org.jboss-jbossesb-default.*" failonerror="false" />
+ <target name="clean">
+ <delete dir="${ivy.lib.dir}" quiet="true"/>
</target>
<target name="cleancache" depends="ivy.init">
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/ivy.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -21,6 +21,7 @@
<dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4"/>
<dependency org="com.h2database" name="h2" rev="1.0.68"/>
<dependency org="hibernate" name="hibernate3" rev="3.2.4.SP1"/>
+ <dependency org="org.hibernate" name="ejb3-persistence" rev="1.0.2.GA"/>
<dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
<dependency org="jgroups" name="jgroups" rev="2.4.1"/>
@@ -172,5 +173,12 @@
<dependency org="org.jboss.ws.native" name="jbossws-native-core" rev="3.0.5.GA"/>
<dependency org="org.jboss.ws" name="jbossws-common" rev="1.0.8.GA"/>
+ <!-- JOPR dependencies -->
+ <dependency org="org.jboss.jopr" name="jopr-embedded-jbas4" rev="1.2.0.GA">
+ <artifact name="jopr-embedded-jbas4" type="war"/>
+ </dependency>
+ <dependency org="org.jboss.jopr" name="jopr-embedded-jbas5" rev="1.3.2.GA">
+ <artifact name="jopr-embedded-jbas5" type="war"/>
+ </dependency>
</dependencies>
</ivy-module>
Modified: labs/jbossesb/trunk/product/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/ivysettings.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/ivysettings.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -13,15 +13,15 @@
<artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</chain>
- <url name="mvel" m2compatible="true">
- <artifact pattern="http://repo1.maven.org/maven2/org/mvel/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
- </url>
<url name="smooks" m2compatible="true">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
+ <url name="ejb3" m2compatible="true">
+ <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].jar"/>
+ </url>
</resolvers>
<modules>
- <module organisation="org.codehaus.mvel" name="mvel" resolver="mvel"/>
<module organisation="org.milyn" name="*" resolver="smooks"/>
+ <module organisation="org.hibernate" name="ejb3-persistence" resolver="ejb3"/>
</modules>
</ivysettings>
Modified: labs/jbossesb/trunk/product/tools/jonplugin/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -1,15 +1,11 @@
-<project name="jon-build" default="build-plugins" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
- <property name="build.dir" location="build"/>
-
- <property name="ivy.lib.dir" location="${build.dir}/lib"/>
- <property name="classpath.dir" location="../../../antlib"/>
+<project name="jon-build" default="build-plugins" basedir=".">
<property name="product.dir" location="../.."/>
<property name="product.build.dir" location="${product.dir}/build"/>
<property name="product.lib.dir" location="${product.build.dir}/lib"/>
+ <property name="jbossesb.lib.dir" location="${product.build.dir}/jbossesb/lib"/>
- <property name="server.default.lib.dir" location="${product.build.dir}/jbossesb-server-4.6/server/default/lib"/>
-
+ <property name="build.dir" location="build"/>
<property name="extract.dir" location="${build.dir}/extract"/>
<property name="extract.as4.dir" location="${extract.dir}/as4"/>
<property name="extract.as5.dir" location="${extract.dir}/as5"/>
@@ -26,13 +22,6 @@
<property name="classes.as4.dir" location="${classes.dir}/as4"/>
<property name="classes.as5.dir" location="${classes.dir}/as5"/>
- <property name="jonserver.as4" location="build/lib/jopr-embedded-jbas4-1.2.0.GA.war"/>
- <property name="jonserver.as5" location="build/lib/jopr-embedded-jbas5-1.3.2.GA.war"/>
- <path id="classpath.ivy">
- <fileset dir="${classpath.dir}" includes="ivy-*.jar" />
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="classpath.ivy" />
-
<patternset id="jonserver.patternset">
<include name="**/rhq-jbossas-plugin*.jar"/>
<include name="**/rhq-core-domain-*.jar"/>
@@ -43,23 +32,16 @@
<include name="**/jopr-jboss-as-*plugin-*.jar"/>
</patternset>
- <target name="ivy.init" depends="clean">
- <ivy:settings file="ivysettings.xml" />
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${ivy.lib.dir}"/>
- <mkdir dir="${extract.dir}"/>
- <mkdir dir="${classes.dir}"/>
- </target>
-
- <target name="retrieve" depends="ivy.init">
- <ivy:retrieve/>
- </target>
-
- <target name="cleancache" depends="ivy.init">
- <ivy:cleancache/>
- </target>
-
<target name="init" depends="clean">
+ <path id="jonserver.as4">
+ <fileset dir="${product.lib.dir}" includes="jopr-embedded-jbas4-*.war"/>
+ </path>
+ <property name="jonserver.as4" refid="jonserver.as4"/>
+ <path id="jonserver.as5">
+ <fileset dir="${product.lib.dir}" includes="jopr-embedded-jbas5-*.war"/>
+ </path>
+ <property name="jonserver.as5" refid="jonserver.as5"/>
+
<mkdir dir="${build.dir}"/>
<mkdir dir="${extract.dir}"/>
<mkdir dir="${extract.as4.dir}"/>
@@ -70,7 +52,7 @@
</target>
<target name="clean">
- <delete dir="build"/>
+ <delete dir="${build.dir}"/>
</target>
<target name="extract-as4-classpath-jars" depends="init">
@@ -87,22 +69,9 @@
</fileset>
</unzip>
- <path id="plugin.as4.location">
- <fileset dir="${extract.as4.dir}" includes="**/rhq-jbossas-plugin*.jar"/>
- </path>
- <property name="plugin.as4.location" refid="plugin.as4.location"/>
- <dirname property="plugin.as4.dir" file="${plugin.as4.location}"/>
-
<path id="as4.classpath">
<fileset dir="${extract.as4.dir}" includes="**/*.jar"/>
</path>
-
- <pathconvert property="zip.as4.plugin.location" targetos="unix">
- <path path="${plugin.as4.dir}"/>
- <mapper>
- <globmapper from="${extract.as4.dir}/*" to="*"/>
- </mapper>
- </pathconvert>
</target>
<target name="extract-as5-classpath-jars" depends="init">
@@ -137,26 +106,24 @@
</pathconvert>
</target>
- <target name="compile-as4-plugin" depends="retrieve,extract-as4-classpath-jars">
+ <target name="compile-as4-plugin" depends="extract-as4-classpath-jars">
<javac destdir="${classes.as4.dir}" debug="true" source="1.5">
<src path="${java.dir}"/>
<src path="${java.as4.dir}"/>
<classpath>
<path refid="as4.classpath"/>
- <fileset dir="${product.lib.dir}" includes="commons-logging*.jar"/>
- <fileset dir="${server.default.lib.dir}" includes="ejb3-persistence.jar, hibernate3.jar, hibernate-annotations.jar, hibernate-entitymanager.jar"/>
+ <fileset dir="${product.lib.dir}" includes="commons-logging*.jar ejb3-persistence*.jar jaxb-api-*.jar jbossall-client*.jar"/>
</classpath>
</javac>
</target>
- <target name="compile-as5-plugin" depends="retrieve,extract-as5-classpath-jars">
+ <target name="compile-as5-plugin" depends="extract-as5-classpath-jars">
<javac destdir="${classes.as5.dir}" debug="true" source="1.5">
<src path="${java.dir}"/>
<src path="${java.as5.dir}"/>
<classpath>
<path refid="as5.classpath"/>
- <fileset dir="${product.lib.dir}" includes="commons-logging*.jar"/>
- <fileset dir="${server.default.lib.dir}" includes="ejb3-persistence.jar, hibernate3.jar, hibernate-annotations.jar, hibernate-entitymanager.jar"/>
+ <fileset dir="${product.lib.dir}" includes="commons-logging*.jar ejb3-persistence*.jar jaxb-api-*.jar jbossall-client*.jar"/>
</classpath>
</javac>
</target>
@@ -177,5 +144,11 @@
</jar>
</target>
- <target name="build-plugins" depends="jar-as4-plugin, jar-as5-plugin"/>
+ <target name="build-plugins" depends="jar-as4-plugin, jar-as5-plugin">
+ <copy todir="${jbossesb.lib.dir}">
+ <fileset dir="${build.dir}" includes="${esb.plugin.jar.name}-*.jar"/>
+ <fileset file="${jonserver.as4}"/>
+ <fileset file="${jonserver.as5}"/>
+ </copy>
+ </target>
</project>
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
- <info organisation="org.jboss" module="jbossesb"/>
- <dependencies>
- <dependency org="org.jboss.jopr" name="jopr-embedded-jbas4" rev="1.2.0.GA">
- <artifact name="jopr-embedded-jbas4" type="war"/>
- </dependency>
-
- <dependency org="org.jboss.jopr" name="jopr-embedded-jbas5" rev="1.3.2.GA">
- <artifact name="jopr-embedded-jbas5" type="war"/>
- </dependency>
- </dependencies>
-</ivy-module>
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -1,8 +0,0 @@
-<ivysettings>
- <settings defaultResolver="jbossMaven"/>
- <resolvers>
- <url name="jbossMaven">
- <artifact pattern="http://repository.jboss.com/maven2/org/jboss/jopr/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
- </url>
- </resolvers>
-</ivysettings>
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/pom.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/pom.xml 2009-10-28 15:32:26 UTC (rev 29851)
+++ labs/jbossesb/trunk/product/tools/jonplugin/pom.xml 2009-10-28 15:36:34 UTC (rev 29852)
@@ -1,237 +0,0 @@
-<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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.on</groupId>
- <!-- Bypass the jon-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
- <artifactId>jon-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.on</groupId>
- <artifactId>rhq-jbossesb-plugin</artifactId>
- <packaging>jar</packaging>
-
- <name>JON JBossESB Plugin</name>
- <description>A plugin for managing JBossESB services</description>
-
- <scm>
- <connection>scm:svn:http://svn.corp.jboss.com/repos/jon/trunk/jon/plugins/jbossesb/</connection>
- <developerConnection>scm:svn:http://svn.corp.jboss.com/repos/jon/trunk/jon/plugins/jbossesb/</developerConnection>
- </scm>
-
- <properties>
- <scm.module.path>jon/plugins/jbossesb/</scm.module.path>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.on</groupId>
- <artifactId>rhq-jbossas-plugin</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.on</groupId>
- <artifactId>jopr-jboss-as-plugin</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.on</groupId>
- <artifactId>jopr-jboss-as-5-plugin</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </dependency>
-
-
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Used to add dependencies to the plugin lib
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-postgres-jar</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.1-407.jdbc3</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>-->
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>maven.test.skip</name>
- <value>!true</value>
- </property>
- </activation>
-
- <build>
- <plugins>
- <!-- Integration testing voodoo to load and test this plugin with its plugin dependencies -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
- <mkdir dir="target/itest" />
- <mkdir dir="target/itest/plugins" />
- <mkdir dir="target/itest/lib" />
- <copy toDir="target/itest/plugins" flatten="true">
- <fileset dir="${settings.localRepository}/">
- <include name="org/rhq/rhq-platform-plugin/${rhq.version}/rhq-platform-plugin-${rhq.version}.jar" />
- <include name="org/rhq/rhq-jmx-plugin/${rhq.version}/rhq-jmx-plugin-${rhq.version}.jar" />
- <include name="org/jboss/on/rhq-tomcat-plugin/${project.version}/rhq-tomcat-plugin-${project.version}.jar" />
- <include name="org/jboss/on/rhq-jbossas-plugin/${project.version}/rhq-jbossas-plugin-${project.version}.jar" />
- </fileset>
- <fileset dir="${project.build.directory}">
- <include name="${project.artifactId}-${project.version}.jar" />
- </fileset>
- </copy>
- <unzip dest="target/itest/lib">
- <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" />
- <patternset>
- <include name="**/lib/sigar.jar" />
- <include name="**/lib/bcel*.jar" />
- <include name="**/lib/*.so" />
- <include name="**/lib/*.sl" />
- <include name="**/lib/*.dll" />
- <include name="**/lib/*.dylib" />
- </patternset>
- </unzip>
- <move todir="target/itest/lib" flatten="true">
- <fileset dir="target/itest/lib">
- <include name="**/lib/*" />
- </fileset>
- </move>
- <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
- <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
- <systemProperties>
- <property>
- <name>project.artifactId</name>
- <value>${project.artifactId}</value>
- </property>
- <property>
- <name>project.version</name>
- <value>${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../..</rhq.rootDir>
- <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
- <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-downloads/rhq-plugins</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>deploy</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <mkdir dir="${rhq.deploymentDir}" />
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
More information about the jboss-svn-commits
mailing list