[jboss-svn-commits] JBL Code SVN: r29809 - in labs/jbossesb/trunk/product: install/embedded-console and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 26 09:21:18 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-10-26 09:21:17 -0400 (Mon, 26 Oct 2009)
New Revision: 29809
Added:
labs/jbossesb/trunk/product/tools/jonplugin/as4/src/main/java/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/
labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java
labs/jbossesb/trunk/product/tools/jonplugin/jonserver/
labs/jbossesb/trunk/product/tools/jonplugin/jonserver/jbas4-admin-console.war
labs/jbossesb/trunk/product/tools/jonplugin/jonserver/jbas5-admin-console.war
Removed:
labs/jbossesb/trunk/product/install/embedded-console/jbas4-admin-console.war
labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
labs/jbossesb/trunk/product/install/embedded-console/measurementpatch.txt
labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml
labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml
labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java
labs/jbossesb/trunk/product/tools/jonplugin/src/main/resources/
labs/jbossesb/trunk/product/tools/jonplugin/src/test/
Modified:
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/install/embedded-console/build.xml
labs/jbossesb/trunk/product/tools/jonplugin/build.xml
Log:
Rework jonplugin build: JBESB-2907
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/install/build.xml 2009-10-26 13:21:17 UTC (rev 29809)
@@ -180,7 +180,7 @@
<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="copy-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>
@@ -346,7 +346,7 @@
<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="copy-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>
Modified: labs/jbossesb/trunk/product/install/embedded-console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/embedded-console/build.xml 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/install/embedded-console/build.xml 2009-10-26 13:21:17 UTC (rev 29809)
@@ -14,15 +14,6 @@
</not>
</condition>
- <target name="replace">
- <loadfile property="measurement.category"
- srcFile="measurementpatch.txt"/>
- <replace file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/jboss-log4j.xml"
- value="${measurement.category}">
- <replacetoken><![CDATA[<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->]]></replacetoken>
- </replace>
- </target>
-
<target name="copy-jbas4-console" if="jbossas4">
<copy file="jbas4-admin-console.war" todir="${deploy.dir}"/>
</target>
@@ -40,6 +31,10 @@
</unzip>
</target>
- <target name="copy-console" depends="replace,copy-jbas4-console,copy-jbas5-console">
+ <target name="copy-console" depends="copy-jbas4-console,copy-jbas5-console">
</target>
+
+ <target name="install">
+ <echo>Console install not yet implemented</echo>
+ </target>
</project>
Deleted: labs/jbossesb/trunk/product/install/embedded-console/jbas4-admin-console.war
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/install/embedded-console/measurementpatch.txt
===================================================================
--- labs/jbossesb/trunk/product/install/embedded-console/measurementpatch.txt 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/install/embedded-console/measurementpatch.txt 2009-10-26 13:21:17 UTC (rev 29809)
@@ -1,23 +0,0 @@
-<!-- Limit the org.jboss.on.pc.impl.measurement category to WARN -->
- <category name="org.jboss.on.pc.impl.measurement">
- <priority value="ERROR"/>
- </category>
-
- <!-- Limit the org.jboss.seam category to WARN -->
- <!-- Recommended by embedded console -->
- <category name="org.jboss.seam">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the com.sun category to WARN -->
- <!-- Recommended by embedded console -->
- <category name="com.sun">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor to WARN -->
- <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
Copied: labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java (from rev 29804, labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java)
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java (rev 0)
+++ labs/jbossesb/trunk/product/tools/jonplugin/as5/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java 2009-10-26 13:21:17 UTC (rev 29809)
@@ -0,0 +1,20 @@
+package org.jbosson.plugins.jbossesb;
+
+import java.io.File;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.plugins.jbossas5.ApplicationServerComponent;
+
+public class ESB5Component extends ESBComponent
+{
+ public File getConfigurationPath()
+ {
+ ApplicationServerComponent jass = (ApplicationServerComponent)this.resourceContext.getParentResourceComponent();
+ ResourceContext rc = jass.getResourceContext();
+ Configuration config = rc.getPluginConfiguration();
+
+ String configurationPath = config.getSimpleValue("homeDir", null);
+
+ return new File(configurationPath);
+ }
+}
Modified: labs/jbossesb/trunk/product/tools/jonplugin/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/tools/jonplugin/build.xml 2009-10-26 13:21:17 UTC (rev 29809)
@@ -1,127 +1,154 @@
-<project name="jon-build" default="build-plugins" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+<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="build.dir" location="build"/>
- <property name="ivy.lib.dir" location="${build.dir}/lib"/>
<property name="extract.dir" location="${build.dir}/extract"/>
- <property name="classpath.dir" location="../../../antlib"/>
+ <property name="extract.as4.dir" location="${extract.dir}/as4"/>
+ <property name="extract.as5.dir" location="${extract.dir}/as5"/>
<property name="esb.plugin.jar.version" value="2.3.0-SNAPSHOT"/>
<property name="esb.plugin.jar.name" value="rhq-jbossesb-plugin-${esb.plugin.jar.version}"/>
- <property name="esb.server.zip.version" value=""/>
- <property name="esb.agent.zip.version" value=""/>
<property name="src.dir" location="src/main"/>
<property name="java.dir" location="${src.dir}/java"/>
- <property name="resources.dir" location="${src.dir}/resources"/>
+ <property name="java.as4.dir" location="as4/src/main/java"/>
+ <property name="java.as5.dir" location="as5/src/main/java"/>
<property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="classes.as4.dir" location="${classes.dir}/as4"/>
+ <property name="classes.as5.dir" location="${classes.dir}/as5"/>
- <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" />
+ <property name="jonserver.as4" location="jonserver/jbas4-admin-console.war"/>
+ <property name="jonserver.as5" location="jonserver/jbas5-admin-console.war"/>
- <target name="ivy.init" depends="clean">
- <ivy:settings file="ivysettings.xml" />
+ <patternset id="jonserver.patternset">
+ <include name="**/rhq-jbossas-plugin*.jar"/>
+ <include name="**/rhq-core-domain-*.jar"/>
+ <include name="**/rhq-jmx-plugin-*.jar"/>
+ <include name="**/rhq-core-plugin-api-*.jar"/>
+ <include name="**/rhq-tomcat-plugin-*.jar"/>
+ <include name="**/rhq-core-native-system-*.jar"/>
+ <include name="**/jopr-jboss-as-*plugin-*.jar"/>
+ </patternset>
+
+ <target name="init" depends="clean">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${ivy.lib.dir}"/>
<mkdir dir="${extract.dir}"/>
+ <mkdir dir="${extract.as4.dir}"/>
+ <mkdir dir="${extract.as5.dir}"/>
<mkdir dir="${classes.dir}"/>
+ <mkdir dir="${classes.as4.dir}"/>
+ <mkdir dir="${classes.as5.dir}"/>
</target>
- <target name="retrieve" depends="ivy.init">
- <ivy:retrieve/>
- </target>
-
<target name="clean">
<delete dir="${build.dir}"/>
- <delete file="${basedir}/src/main/resources/META-INF/rhq-plugin.xml"/>
</target>
- <target name="cleancache" depends="ivy.init">
- <ivy:cleancache/>
- </target>
+ <target name="extract-as4-classpath-jars" depends="init">
+ <unzip dest="${extract.as4.dir}" src="${jonserver.as4}">
+ <patternset refid="jonserver.patternset"/>
+ </unzip>
- <target name="report" depends="retrieve" description="--> generates a report of dependencies">
- <ivy:report todir="${ivy.lib.dir}"/>
- </target>
+ <unzip dest="${extract.as4.dir}">
+ <patternset>
+ <include name="**/org-mc4j-ems*.jar"/>
+ </patternset>
+ <fileset dir="${extract.as4.dir}">
+ <include name="**/rhq-jmx-plugin-*.jar"/>
+ </fileset>
+ </unzip>
- <target name="extract-classpath-jars" depends="retrieve">
- <path id="jon.server.location">
- <fileset dir="${ivy.lib.dir}" includes="jon-server*.zip"/>
+ <path id="plugin.as4.location">
+ <fileset dir="${extract.as4.dir}" includes="**/rhq-jbossas-plugin*.jar"/>
</path>
- <path id="jon.eap.plugin.pack.location">
- <fileset dir="${ivy.lib.dir}" includes="jon-plugin-pack-eap-*.zip"/>
- </path>
- <property name="jon.eap.plugin.pack.location" refid="jon.eap.plugin.pack.location"/>
- <property name="jon.server.location" refid="jon.server.location"/>
+ <property name="plugin.as4.location" refid="plugin.as4.location"/>
+ <dirname property="plugin.as4.dir" file="${plugin.as4.location}"/>
- <unzip dest="${extract.dir}" src="${jon.server.location}">
- <patternset>
- <include name="**/rhq-jbossas-plugin*.jar"/>
- <include name="**/rhq-core-domain-*.jar"/>
- <include name="**/rhq-jmx-plugin-*.jar"/>
- <include name="**/rhq-core-plugin-api-*.jar"/>
- <include name="**/rhq-tomcat-plugin-*.jar"/>
- <include name="**/rhq-core-native-system-*.jar"/>
-<include name="**/ejb3-persistence.jar"/> <include name="**/lib/hibernate-annotations.jar"/>
+ <path id="as4.classpath">
+ <fileset dir="${extract.as4.dir}" includes="**/*.jar"/>
+ </path>
- <include name="**/commons-logging-*.jar"/>
- <include name="**/endorsed/jaxb-api.jar"/>
- </patternset>
+ <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">
+ <unzip dest="${extract.as5.dir}" src="${jonserver.as5}">
+ <patternset refid="jonserver.patternset"/>
</unzip>
- <unzip dest="${extract.dir}" src="${jon.eap.plugin.pack.location}">
- <patternset>
- <include name="**/jopr-jboss-as-plugin-*.jar"/>
- <include name="**/jopr-jboss-as-5-plugin-*.jar"/>
- </patternset>
- </unzip>
- <unzip dest="${extract.dir}">
+
+ <unzip dest="${extract.as5.dir}">
<patternset>
<include name="**/org-mc4j-ems*.jar"/>
</patternset>
- <fileset dir="${extract.dir}">
+ <fileset dir="${extract.as5.dir}">
<include name="**/rhq-jmx-plugin-*.jar"/>
</fileset>
</unzip>
- <path id="plugin.location">
- <fileset dir="${extract.dir}" includes="**/rhq-jbossas-plugin*.jar"/>
+
+ <path id="plugin.as5.location">
+ <fileset dir="${extract.as5.dir}" includes="**/rhq-jbossas-plugin*.jar"/>
</path>
- <property name="plugin.location" refid="plugin.location"/>
- <dirname property="plugin.dir" file="${plugin.location}"/>
- <path id="classpath">
- <fileset dir="${extract.dir}" includes="**/*.jar"/>
+ <property name="plugin.as5.location" refid="plugin.as5.location"/>
+ <dirname property="plugin.as5.dir" file="${plugin.as5.location}"/>
+
+ <path id="as5.classpath">
+ <fileset dir="${extract.as5.dir}" includes="**/*.jar"/>
</path>
- <pathconvert property="zip.plugin.location" targetos="unix">
- <path path="${plugin.dir}"/>
+
+ <pathconvert property="zip.as5.plugin.location" targetos="unix">
+ <path path="${plugin.as5.dir}"/>
<mapper>
- <globmapper from="${extract.dir}/*" to="*"/>
+ <globmapper from="${extract.as5.dir}/*" to="*"/>
</mapper>
</pathconvert>
</target>
- <target name="compile-plugin" depends="extract-classpath-jars">
- <javac srcdir="${java.dir}" destdir="${classes.dir}" debug="true" classpathref="classpath" source="1.5"/>
+ <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"/>
+ </classpath>
+ </javac>
</target>
- <target name="jar-as4-plugin" depends="compile-plugin">
+ <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"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="jar-as4-plugin" depends="compile-as4-plugin">
<echo message="Plugin version is ${esb.plugin.jar.version}"/>
<jar destfile="${build.dir}/${esb.plugin.jar.name}-as4.jar">
- <fileset dir="${classes.dir}"/>
- <fileset dir="${resources.dir}"/>
+ <fileset dir="${classes.as4.dir}"/>
<fileset dir="${basedir}/as4/src/main/resources"/>
</jar>
</target>
- <target name="jar-as5-plugin" depends="compile-plugin">
+ <target name="jar-as5-plugin" depends="compile-as5-plugin">
<echo message="Plugin version is ${esb.plugin.jar.version}"/>
<jar destfile="${build.dir}/${esb.plugin.jar.name}-as5.jar">
- <fileset dir="${classes.dir}"/>
- <fileset dir="${resources.dir}"/>
+ <fileset dir="${classes.as5.dir}"/>
<fileset dir="${basedir}/as5/src/main/resources"/>
</jar>
</target>
<target name="build-plugins" depends="jar-as4-plugin, jar-as5-plugin"/>
-
</project>
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/tools/jonplugin/ivy.xml 2009-10-26 13:21:17 UTC (rev 29809)
@@ -1,15 +0,0 @@
-<ivy-module version="2.0">
- <info organisation="org.jboss" module="jbossesb"/>
- <dependencies>
-<!-- <dependency org="org.jboss.on" name="jon-agent" rev="2.3.0.GA">
- <artifact name="jon-agent" type="zip"/>
- </dependency>
--->
- <dependency org="org.jboss.on" name="jon-plugin-pack-eap" rev="2.3.0.GA">
- <artifact name="jon-plugin-pack-eap" type="zip"/>
- </dependency>
- <dependency org="org.jboss.on" name="jon-server" rev="2.3.0.GA">
- <artifact name="jon-server" type="zip"/>
- </dependency>
- </dependencies>
-</ivy-module>
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/tools/jonplugin/ivysettings.xml 2009-10-26 13:21:17 UTC (rev 29809)
@@ -1,8 +0,0 @@
-<ivysettings>
- <settings defaultResolver="jonQA"/>
- <resolvers>
- <url name="jonQA">
- <artifact pattern="http://jon01.qa.atl2.redhat.com:8042/dist/qa/[artifact]-[revision].[ext]"/>
- </url>
- </resolvers>
-</ivysettings>
Copied: labs/jbossesb/trunk/product/tools/jonplugin/jonserver/jbas4-admin-console.war (from rev 29804, labs/jbossesb/trunk/product/install/embedded-console/jbas4-admin-console.war)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/tools/jonplugin/jonserver/jbas5-admin-console.war (from rev 29804, labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java 2009-10-26 13:21:16 UTC (rev 29808)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESB5Component.java 2009-10-26 13:21:17 UTC (rev 29809)
@@ -1,20 +0,0 @@
-package org.jbosson.plugins.jbossesb;
-
-import java.io.File;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-import org.rhq.plugins.jbossas5.ApplicationServerComponent;
-
-public class ESB5Component extends ESBComponent
-{
- public File getConfigurationPath()
- {
- ApplicationServerComponent jass = (ApplicationServerComponent)this.resourceContext.getParentResourceComponent();
- ResourceContext rc = jass.getResourceContext();
- Configuration config = rc.getPluginConfiguration();
-
- String configurationPath = config.getSimpleValue("homeDir", null);
-
- return new File(configurationPath);
- }
-}
More information about the jboss-svn-commits
mailing list