[jboss-cvs] JBoss Messaging SVN: r2705 - in trunk: docs/examples and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 17 17:34:07 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-05-17 17:34:07 -0400 (Thu, 17 May 2007)
New Revision: 2705
Added:
trunk/docs/examples/examples.properties
trunk/util/release-admin.properties
Removed:
trunk/util/release-admin.properties.example
Modified:
trunk/build-messaging.xml
trunk/docs/examples/distributed-queue/build.xml
trunk/docs/examples/distributed-topic/build.xml
trunk/docs/examples/ejb3mdb/build.xml
trunk/docs/examples/http/build.xml
trunk/docs/examples/mdb-failure/build.xml
trunk/docs/examples/mdb/build.xml
trunk/docs/examples/queue-failover/build.xml
trunk/docs/examples/queue/build.xml
trunk/docs/examples/secure-socket/build.xml
trunk/docs/examples/stateless/build.xml
trunk/docs/examples/topic/build.xml
trunk/tests/smoke/build.xml
Log:
We don't need temporary properties any more... fixing the build to not need those.
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/build-messaging.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -526,13 +526,19 @@
<fileset dir="${build.api}" includes="**"/>
</copy>
<copy todir="${release.output}/util">
- <fileset dir="./util">
+ <fileset dir="./util" excludes="release-admin.properties">
<include name="**"/>
</fileset>
</copy>
<zip destfile="${build.lib}/jboss-messaging-${module.version}.zip">
<zipfileset dir="${release.output}" prefix="jboss-messaging-${module.version}/"/>
<zipfileset dir="./src/etc/server/default/config" prefix="jboss-messaging-${module.version}/src/etc/server/default/config/"/>
+
+ <!-- Adding these files for user's convenience -->
+ <zipfileset dir="./thirdparty/jboss/remoting/lib" prefix="jboss-messaging-${module.version}/thirdparty"/>
+ <zipfileset dir="./thirdparty/jboss/aop/lib" prefix="jboss-messaging-${module.version}/thirdparty"/>
+ <zipfileset dir="./thirdparty/jgroups/lib" prefix="jboss-messaging-${module.version}/thirdparty"/>
+ <zipfileset dir="./thirdparty/javassist/lib" includes="jboss-messaging-${module.version}/javassist.jar" prefix="thirdparty"/>
</zip>
<echo message="Release bundle jboss-messaging-${module.version}.zip done"/>
</target>
@@ -550,7 +556,7 @@
<target name="examples" depends="release-structure">
<copy todir="${release.output}/examples">
- <fileset dir="./docs/examples">
+ <fileset dir="./docs/examples" excludes="examples.properties">
<exclude name="programmatic-deployment"/>
</fileset>
</copy>
Modified: trunk/docs/examples/distributed-queue/build.xml
===================================================================
--- trunk/docs/examples/distributed-queue/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/distributed-queue/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -15,6 +15,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/distributed-topic/build.xml
===================================================================
--- trunk/docs/examples/distributed-topic/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/distributed-topic/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -12,8 +12,10 @@
<property environment="ENV"/>
+ <property file="../examples.properties"/>
+
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../"/>
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration0" value="messaging-node0"/>
Modified: trunk/docs/examples/ejb3mdb/build.xml
===================================================================
--- trunk/docs/examples/ejb3mdb/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/ejb3mdb/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Added: trunk/docs/examples/examples.properties
===================================================================
--- trunk/docs/examples/examples.properties (rev 0)
+++ trunk/docs/examples/examples.properties 2007-05-17 21:34:07 UTC (rev 2705)
@@ -0,0 +1 @@
+messaging.client.jar.path=../../../output/lib
Modified: trunk/docs/examples/http/build.xml
===================================================================
--- trunk/docs/examples/http/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/http/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/mdb/build.xml
===================================================================
--- trunk/docs/examples/mdb/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/mdb/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/mdb-failure/build.xml
===================================================================
--- trunk/docs/examples/mdb-failure/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/mdb-failure/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -16,6 +16,7 @@
<property name="undeploy.failonerror" value="true"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/queue/build.xml
===================================================================
--- trunk/docs/examples/queue/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/queue/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/queue-failover/build.xml
===================================================================
--- trunk/docs/examples/queue-failover/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/queue-failover/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/secure-socket/build.xml
===================================================================
--- trunk/docs/examples/secure-socket/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/secure-socket/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../.."/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/stateless/build.xml
===================================================================
--- trunk/docs/examples/stateless/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/stateless/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/docs/examples/topic/build.xml
===================================================================
--- trunk/docs/examples/topic/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/docs/examples/topic/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -13,6 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
+ <property file="../examples.properties"/>
<property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/tests/smoke/build.xml 2007-05-17 21:34:07 UTC (rev 2705)
@@ -110,15 +110,15 @@
4.2.0.GA
-->
-
+
<antcall target="installation-test">
<param name="jboss.home" value="${jboss420GA.home}"/>
- </antcall>
+ </antcall>
</target>
<target name="old-client-compatibility-tests">
-
+
<!-- ==================================================== -->
<!-- -->
<!-- Add here other old client versions to test: -->
@@ -164,13 +164,11 @@
<antcall target="run-example">
<param name="example.name" value="queue"/>
<param name="example.queue.name" value="SmokeTestQueue"/>
- <param name="jboss.home" value="${jboss.home}"/>
</antcall>
<antcall target="run-example">
<param name="example.name" value="topic"/>
<param name="example.topic.name" value="SmokeTestTopic"/>
- <param name="jboss.home" value="${jboss.home}"/>
</antcall>
<antcall target="run-example">
@@ -232,7 +230,6 @@
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-queue">
<param name="example.queue.name" value="SmokeTestQueue"/>
- <param name="jnpPort" value="1199"/>
</antcall>
<!--
@@ -245,7 +242,6 @@
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-queue">
<param name="example.queue.name" value="DistributedSmokeTestQueue"/>
- <param name="jnpPort" value="1199"/>
</antcall>
<!--
@@ -259,7 +255,6 @@
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-topic">
<param name="example.topic.name" value="SmokeTestTopic"/>
- <param name="jnpPort" value="1199"/>
</antcall>
<!--
@@ -272,7 +267,6 @@
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-topic">
<param name="example.topic.name" value="DistributedSmokeTestTopic"/>
- <param name="jnpPort" value="1199"/>
</antcall>
<!--
@@ -495,7 +489,7 @@
-->
<antcall target="run-all-clustered-examples"/>
-
+
</target>
<target name="check-java-version">
@@ -589,9 +583,7 @@
<ant dir="../../docs/examples/${example.name}" antfile="build.xml" target="clean"/>
- <ant dir="../../docs/examples/${example.name}" antfile="build.xml">
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
- </ant>
+ <ant dir="../../docs/examples/${example.name}" antfile="build.xml"/>
<echo message="Example ${example.name} executed successfully, cleaning ..."/>
Added: trunk/util/release-admin.properties
===================================================================
--- trunk/util/release-admin.properties (rev 0)
+++ trunk/util/release-admin.properties 2007-05-17 21:34:07 UTC (rev 2705)
@@ -0,0 +1,4 @@
+#
+# This file shouldn't be available on the Zip bundle
+#
+sar.location=../output/lib
Deleted: trunk/util/release-admin.properties.example
===================================================================
--- trunk/util/release-admin.properties.example 2007-05-17 18:20:57 UTC (rev 2704)
+++ trunk/util/release-admin.properties.example 2007-05-17 21:34:07 UTC (rev 2705)
@@ -1,13 +0,0 @@
-#
-# Example properties file for locally overriding any environment variables for release-admin.xml
-# Rename it to release-admin.xml for it to take effect
-#
-#
-main.artifact.location=../output/lib
-auxiliary.artifacts.location=../src/etc/server/default/deploy
-messaging.artifact.name=jboss-messaging.sar
-#
-# standalone config name override
-#
-standalone.messaging.config.name=sm
-
More information about the jboss-cvs-commits
mailing list