[jboss-cvs] JBoss Messaging SVN: r6308 - in trunk: AS and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 3 12:43:27 EDT 2009
Author: ataylor
Date: 2009-04-03 12:43:27 -0400 (Fri, 03 Apr 2009)
New Revision: 6308
Added:
trunk/src/config/examples-ant.properties
Removed:
trunk/AS/config/examples-ant.properties
Modified:
trunk/AS/build.xml
trunk/build-messaging.xml
Log:
example fix and distro script
Modified: trunk/AS/build.xml
===================================================================
--- trunk/AS/build.xml 2009-04-03 16:43:22 UTC (rev 6307)
+++ trunk/AS/build.xml 2009-04-03 16:43:27 UTC (rev 6308)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- JBoss, Home of Professional Open Source -->
+<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated -->
+<!-- by the @authors tag. See the copyright.txt in the distribution for a -->
+<!-- full listing of individual contributors. -->
+<!-- -->
+<!-- This is free software; you can redistribute it and/or modify it -->
+<!-- under the terms of the GNU Lesser General Public License as -->
+<!-- published by the Free Software Foundation; either version 2.1 of -->
+<!-- the License, or (at your option) any later version. -->
+<!-- -->
+<!-- This software is distributed in the hope that it will be useful, -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
+<!-- Lesser General Public License for more details. -->
+<!-- -->
+<!-- You should have received a copy of the GNU Lesser General Public -->
+<!-- License along with this software; if not, write to the Free -->
+<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
+<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="default" name="JBoss Messaging">
+ <property environment="ENV"/>
+ <property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
+
+ <property name="config.dir" value="config"/>
+ <property name="main.config.dir" value="../config"/>
+ <property name="lib.dir" value="../lib"/>
+
+ <target name="default">
+ <antcall target="build">
+ <param name="messaging.config.source" value="default"/>
+ <param name="messaging.config.name" value="jbm2_default"/>
+ </antcall>
+ </target>
+
+ <target name="build">
+ <antcall target="validate-jboss"/>
+ <property name="src.dir" value="${jboss.home}/server/${messaging.config.source}"/>
+ <property name="dest.dir" value="${jboss.home}/server/${messaging.config.name}"/>
+ <mkdir dir="${jboss.home}/server/${messaging.config.name}"/>
+ <copy todir="${dest.dir}">
+ <fileset dir="${src.dir}">
+ <exclude name="**/messaging/**"/>
+ <exclude name="conf/login-config.xml"/>
+ <exclude name="**/jms-ra.rar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/conf">
+ <fileset dir="${config.dir}">
+ <include name="login-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/conf/props">
+ <fileset dir="${config.dir}">
+ <include name="messaging-users.properties"/>
+ <include name="messaging-roles.properties"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/lib">
+ <fileset dir="${lib.dir}">
+ <include name="jbm-*.jar"/>
+ <include name="netty*.jar"/>
+ </fileset>
+ </copy>
+ <property name="messaging.sar.dir" value="${dest.dir}/deploy/messaging.sar"/>
+ <mkdir dir="${messaging.sar.dir}"/>
+ <copy todir="${messaging.sar.dir}">
+ <fileset dir="${config.dir}">
+ <include name="jbm-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${messaging.sar.dir}">
+ <fileset dir="${main.config.dir}">
+ <include name="jbm-configuration.xml"/>
+ <include name="jbm-jms.xml"/>
+ <include name="jbm-queues.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/deploy">
+ <fileset dir=".">
+ <include name="jbm-ra.rar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- The JBOSS_HOME environment variable and the directory must exist, we also check we are running
+ in JBoss 5.1 or later -->
+ <target name="validate-jboss">
+ <fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
+ <available property="default-config" type="dir" file="${jboss.home}/server/${messaging.config.source}"/>
+ <fail unless="default-config" message="${jboss.home}/server/${messaging.config.source} not found!"/>
+ <available property="messaging-config" type="dir" file="${jboss.home}/server/${messaging.config.name}"/>
+ <fail if="messaging-config"
+ message="'${messaging.config.name}' configuration already exists! Delete it manually and try again."/>
+ </target>
+
+</project>
Deleted: trunk/AS/config/examples-ant.properties
===================================================================
--- trunk/AS/config/examples-ant.properties 2009-04-03 16:43:22 UTC (rev 6307)
+++ trunk/AS/config/examples-ant.properties 2009-04-03 16:43:27 UTC (rev 6308)
@@ -1,4 +0,0 @@
-jbm.example.logserveroutput=false
-logging.properties=${imported.basedir}/../../../config/logging.properties
-jbm.jars.dir=${imported.basedir}/../../../lib
-jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-04-03 16:43:22 UTC (rev 6307)
+++ trunk/build-messaging.xml 2009-04-03 16:43:27 UTC (rev 6308)
@@ -86,6 +86,7 @@
<property name="build.ra.classes.dir" value="${build.dir}/classes/ra"/>
<property name="build.jars.dir" value="${build.dir}/jars"/>
<property name="build.src.dir" value="${build.dir}/src"/>
+ <property name="as.dir" value="AS"/>
<property name="src.dir" value="src"/>
<property name="src.main.dir" value="${src.dir}/main"/>
<property name="src.config.dir" value="${src.dir}/config"/>
@@ -110,6 +111,7 @@
<property name="build.distro.api.dir" value="${build.distro.dir}/docs/api"/>
<property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
<property name="build.distro.licenses.dir" value="${build.distro.dir}/licenses"/>
+ <property name="build.distro.as.dir" value="${build.distro.dir}/AS"/>
<property name="artifacts.dir" value="${build.dir}/artifacts"/>
<!--default clustering server settings-->
@@ -824,6 +826,7 @@
<mkdir dir="${build.distro.bin.dir}"/>
<mkdir dir="${build.distro.api.dir}"/>
<mkdir dir="${build.distro.licenses.dir}"/>
+ <mkdir dir="${build.distro.as.dir}"/>
<copy todir="${build.distro.lib.dir}">
<fileset dir="${build.jars.dir}">
@@ -954,7 +957,15 @@
</fileset>
</copy>
- <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="AS/config/examples-ant.properties" overwrite="true">
+ <copy todir="${build.distro.as.dir}">
+ <fileset dir="${as.dir}"/>
+ </copy>
+ <copy todir="${build.distro.as.dir}">
+ <fileset dir="${build.jars.dir}">
+ <include name="jbm-ra.rar"/>
+ </fileset>
+ </copy>
+ <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true">
</copy>
<echo message="lib.dir=../../lib${line.separator}client.jar=../../lib/jboss-messaging-client.jar${line.separator}config.dir=../../config${line.separator}server.jar=../../lib/jboss-messaging.jar"
Copied: trunk/src/config/examples-ant.properties (from rev 6283, trunk/AS/config/examples-ant.properties)
===================================================================
--- trunk/src/config/examples-ant.properties (rev 0)
+++ trunk/src/config/examples-ant.properties 2009-04-03 16:43:27 UTC (rev 6308)
@@ -0,0 +1,4 @@
+jbm.example.logserveroutput=false
+logging.properties=${imported.basedir}/../../../config/logging.properties
+jbm.jars.dir=${imported.basedir}/../../../lib
+jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list