[jboss-svn-commits] JBL Code SVN: r29639 - in labs/jbossesb/trunk/product: contract-web and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 16 10:09:12 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-10-16 10:09:11 -0400 (Fri, 16 Oct 2009)
New Revision: 29639
Added:
labs/jbossesb/trunk/product/contract-web/
Removed:
labs/jbossesb/trunk/product/tools/configeditor/
labs/jbossesb/trunk/product/tools/console/
Modified:
labs/jbossesb/trunk/product/.classpath
labs/jbossesb/trunk/product/Developer.txt
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/contract-web/build.xml
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/install/conf/actionArtifactMap.properties
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/actionArtifactMap.properties
labs/jbossesb/trunk/product/services/jbossesb/build.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
Log:
Remove configeditor, old console and management.esb: JBESB-2884
Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/.classpath 2009-10-16 14:09:11 UTC (rev 29639)
@@ -119,8 +119,8 @@
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-1.7.1.jar"/>
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-xmlbeans-1.7.jar"/>
<classpathentry kind="lib" path="services/spring/lib/ext/spring.jar"/>
- <classpathentry kind="lib" path="tools/console/lib/ant.jar"/>
- <classpathentry kind="lib" path="tools/console/lib/hsqldb.jar"/>
+ <classpathentry kind="lib" path="build/lib/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="ESB_ROOT/testlib/hsqldb.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/junit-4.1.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockejb.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockito-all-1.8.0.jar"/>
Modified: labs/jbossesb/trunk/product/Developer.txt
===================================================================
--- labs/jbossesb/trunk/product/Developer.txt 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/Developer.txt 2009-10-16 14:09:11 UTC (rev 29639)
@@ -20,8 +20,6 @@
|---soapui-client
|---spring Spring
|-tools
-|---configeditor
-|---console
Any classes which occur within an 'internal' package are not meant for users. Changes to these
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/build-distr.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -38,11 +38,6 @@
<include name="samples/**/*"/>
</fileset>
</copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
- <fileset dir="${build.dir}/jbossesb">
- <include name="tools/**/*"/>
- </fileset>
- </copy>
<copy todir="${esbserver.dist.dir}/docs/schema">
<fileset dir="${build.dir}/jbossesb/xml/"
includes="jbossesb-1.0.1.xsd jbossesb-1.1.0.xsd jbossesb-1.2.0.xsd"/>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/build.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -47,9 +47,6 @@
<!-- Exclude from javadocs -->
<property name="org.jboss.esb.javadocs.exclude" value="org.jboss.soa.esb.internal.*, org.jboss.soa.esb.services.beans.*"/>
- <property name="console.dir" value="tools/console"/>
- <property name="editor.dir" value="tools/configeditor/editor"/>
-
<!-- Compile with debugging? -->
<condition property="org.jboss.esb.debug" value="no">
<equals arg1="${org.jboss.esb.build.debug}" arg2="no"/>
@@ -289,7 +286,7 @@
<!-- produce a basic installation (minus docs and samples) -->
- <target name="org.jboss.esb.install" depends="org.jboss.esb.tools, org.jboss.esb.jar">
+ <target name="org.jboss.esb.install" depends="org.jboss.esb.contract-web, org.jboss.esb.jar">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
@@ -324,16 +321,6 @@
<echo message="Installed EULA"/>
<copy file="../JBossEULA.txt" todir="${org.jboss.esb.installationdirectory}"/>
-
- <echo message="Installing tools ${org.jboss.esb.installationdirectory}/tools"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/tools"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
-
- <copy file="tools/configeditor/editor/dist/jbossesb-config-editor.war" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/dist"/>
- <copy file="tools/configeditor/editor/resources/action-templates.xml" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
- <copy file="tools/configeditor/editor/README.txt" todir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
</target>
<!-- produce a product distribution -->
@@ -352,9 +339,6 @@
</fileset>
</copy>
- <mkdir dir="${org.jboss.esb.installationdirectory}/docs/tools"/>
- <copy file="tools/configeditor/editor/docs/JBossESBConfigEditor.pdf" todir="${org.jboss.esb.installationdirectory}/docs/tools"/>
-
<mkdir dir="${org.jboss.esb.installationdirectory}/docs/wiki"/>
<copy
todir="${org.jboss.esb.installationdirectory}/docs/wiki"
@@ -424,24 +408,17 @@
<ant antfile="build-distr.xml" target="dist" />
</target>
- <!-- Build the tools into the main dist -->
- <target name="org.jboss.esb.tools">
- <!-- Build the admin console webapp. -->
- <ant dir="${console.dir}" target="dist">
- <property name="install.tools.dir" value="${org.jboss.esb.installationdirectory}/tools/console"/>
- </ant>
- <!-- Build the configuration editor. -->
- <ant dir="${editor.dir}" target="build-war">
- </ant>
+ <target name="org.jboss.esb.contract-web">
+ <ant dir="contract-web" target="dist"/>
</target>
-
+
<!-- Clean targets -->
<target name="org.jboss.esb.clean">
<echo message="Cleaning modules"/>
<echo message="Cleaning rosetta"/>
<ant dir="rosetta" target="clean"/>
- <ant dir="${console.dir}" target="clean"/>
+ <ant dir="contract-web" target="clean"/>
<ant dir="services" target="clean"/>
<delete dir="${org.jboss.esb.internal.dest}"/>
@@ -484,10 +461,6 @@
</zip>
</target>
- <target name="tools" description="builds the tools into the main dist">
- <runant target="org.jboss.esb.tools"/>
- </target>
-
<target name="test" description="will run all tests">
<runant target="esb.test"/>
</target>
Copied: labs/jbossesb/trunk/product/contract-web (from rev 29605, labs/jbossesb/trunk/product/tools/console/contract-web)
Modified: labs/jbossesb/trunk/product/contract-web/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/contract-web/build.xml 2009-10-14 07:59:13 UTC (rev 29605)
+++ labs/jbossesb/trunk/product/contract-web/build.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -1,13 +1,26 @@
<?xml version="1.0"?>
<project name="contract-web" default="war" basedir=".">
- <property name="contract.dir" location="."/>
- <echo>${contract.dir}</echo>
- <target name="war"
+ <property name="build.dir" location="build"/>
+ <property name="contract.war" location="${build.dir}/contract.war"/>
+ <property name="dist.dir" location="../build/jbossesb/lib"/>
+
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}" quiet="true"/>
+ </target>
+
+ <target name="dist" depends="war">
+ <copy file="${contract.war}" todir="${dist.dir}"/>
+ </target>
+
+ <target name="war" depends="init"
description="Build the contract WAR">
- <mkdir dir="${contract.dir}/build"/>
- <war destfile="${contract.dir}/build/contract.war"
- webxml="${contract.dir}/src/main/webapp/WEB-INF/web.xml"
- basedir="${contract.dir}/src/main/webapp"/>
+ <war destfile="${contract.war}"
+ webxml="src/main/webapp/WEB-INF/web.xml"
+ basedir="src/main/webapp"/>
</target>
</project>
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/install/build.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -163,7 +163,7 @@
</copy>
<!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+ <copy file="${org.jboss.esb.dist.lib}/contract.war" todir="${deploy.dir}" />
<!-- install h2 jar -->
<copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
@@ -189,15 +189,6 @@
<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>
-
- <!--
- JBESB-2577
- Don't install deprecated management console.
- <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
- <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>
- -->
</target>
<target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the JBossAS5">
@@ -349,7 +340,7 @@
<copy tofile="${deploy.dir}/soapui-client.sar/META-INF/jboss-service.xml" file="${org.jboss.esb.dist.lib}/soapui-client.sar/META-INF/jboss-service-as5.xml" overwrite="true"/>
<!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+ <copy file="${org.jboss.esb.dist.lib}/contract.war" todir="${deploy.dir}" />
<!-- install h2 jar -->
<copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${org.jboss.esb.server.home}/common/lib" overwrite="true"/>
Modified: labs/jbossesb/trunk/product/install/conf/actionArtifactMap.properties
===================================================================
--- labs/jbossesb/trunk/product/install/conf/actionArtifactMap.properties 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/install/conf/actionArtifactMap.properties 2009-10-16 14:09:11 UTC (rev 29639)
@@ -27,9 +27,6 @@
#
# org.jboss.soa.esb.actions.MessagePersister
# org.jboss.soa.esb.actions.MessageRedeliverer
-# org.jboss.soa.esb.monitoring.client.DataCollectorAction
-# org.jboss.soa.esb.monitoring.client.InvokerAction
-# org.jboss.soa.esb.monitoring.client.OperationsCollectorAction
# jbrules.esb actions
org.jboss.soa.esb.actions.ContentBasedWiretap=jbrules.esb
@@ -51,7 +48,3 @@
org.jboss.soa.esb.actions.converters.SmooksTransformer=smooks.esb
org.jboss.soa.esb.actions.smooks.SmooksAction=smooks.esb
org.jboss.soa.esb.smooks.SmooksAction=smooks.esb
-
-# management.esb actions
-org.jboss.soa.esb.monitoring.server.DataFilerAction=management.esb
-org.jboss.soa.esb.monitoring.server.FilerAction=management.esb
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/actionArtifactMap.properties
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/actionArtifactMap.properties 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/actionArtifactMap.properties 2009-10-16 14:09:11 UTC (rev 29639)
@@ -27,9 +27,6 @@
#
# org.jboss.soa.esb.actions.MessagePersister
# org.jboss.soa.esb.actions.MessageRedeliverer
-# org.jboss.soa.esb.monitoring.client.DataCollectorAction
-# org.jboss.soa.esb.monitoring.client.InvokerAction
-# org.jboss.soa.esb.monitoring.client.OperationsCollectorAction
# jbrules.esb actions
org.jboss.soa.esb.actions.ContentBasedWiretap=jbrules.esb
@@ -51,7 +48,3 @@
org.jboss.soa.esb.actions.converters.SmooksTransformer=smooks.esb
org.jboss.soa.esb.actions.smooks.SmooksAction=smooks.esb
org.jboss.soa.esb.smooks.SmooksAction=smooks.esb
-
-# management.esb actions
-org.jboss.soa.esb.monitoring.server.DataFilerAction=management.esb
-org.jboss.soa.esb.monitoring.server.FilerAction=management.esb
Modified: labs/jbossesb/trunk/product/services/jbossesb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/build.xml 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/services/jbossesb/build.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -6,17 +6,4 @@
<target name="test" depends="base.test"/>
- <target name="management-jar">
- <ant dir="${esb.root.dir}/tools/console/management" target="jar"/>
- </target>
-
- <target name="esb" depends="jar,management-jar">
- <copy todir="build/${ant.project.name}.esb/" overwrite="true">
- <fileset dir="${esb.root.dir}/tools/console/management/build" includes="management-client.jar"/>
- <fileset dir="lib/ext" includes="*.jar"/>
- <fileset dir="src/main/resources/" includes="**/*"/>
- <fileset dir="build" includes="*.jar"/>
- </copy>
- </target>
-
</project>
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml 2009-10-16 14:01:24 UTC (rev 29638)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml 2009-10-16 14:09:11 UTC (rev 29639)
@@ -14,77 +14,12 @@
/>
</jms-bus>
</jms-provider>
- <jms-provider name="Default-JMS-Provider" connection-factory="ConnectionFactory">
- <jms-bus busid="DataCollectorQueue">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/DataCollectorQueue"
- />
- </jms-bus>
- <jms-bus busid="OperationsCollectorQueue">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/OperationsCollectorQueue"
- />
- </jms-bus>
- <jms-bus busid="OperationsResultCollectorQueue">
- <jms-message-filter
- dest-type="QUEUE"
- dest-name="queue/OperationsResultCollectorQueue"
- />
- </jms-bus>
- </jms-provider>
<schedule-provider name="schedule">
<simple-schedule scheduleid="5-min-trigger" frequency="300" execCount="-1"/>
</schedule-provider>
</providers>
<services>
- <service category="JBossESB-Internal"
- name="InvokerService"
- description="Service which sends a CommandMessage with operations result">
- <listeners>
- <jms-listener name="JMS-DCQListener"
- busidref="OperationsResultCollectorQueue"
- maxThreads="1"
- />
- </listeners>
- <actions mep="OneWay">
- <action name="action1"
- class="org.jboss.soa.esb.monitoring.client.InvokerAction"
- process="invokeOperation"/>
- </actions>
- </service>
- <service category="JBossESB-Internal"
- name="OperationsCollectorService"
- description="Service which sends a CommandMessage with operations">
- <listeners>
- <jms-listener name="JMS-DCQListener"
- busidref="OperationsCollectorQueue"
- maxThreads="1"
- />
- </listeners>
- <actions mep="OneWay">
- <action name="action1"
- class="org.jboss.soa.esb.monitoring.client.OperationsCollectorAction"
- process="collectOperations"/>
- </actions>
- </service>
- <service category="JBossESB-Internal"
- name="DataCollectorService"
- description="Service which sends a CommandMessage with statistics">
- <listeners>
- <jms-listener name="JMS-DCQListener"
- busidref="DataCollectorQueue"
- maxThreads="1"
- />
- </listeners>
- <actions mep="OneWay">
- <action name="action1"
- class="org.jboss.soa.esb.monitoring.client.DataCollectorAction"
- process="collectStatistics"/>
- </actions>
- </service>
<service category="JBossESB-Internal"
name="DeadLetterService"
description="Dead Messages can be send to this service, which is configured to store and/or
More information about the jboss-svn-commits
mailing list