[jboss-cvs] JBossAS SVN: r90186 - in branches/JBPAPP_5_0_JBPAPP-2043/messaging2: src/etc and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 15 07:09:43 EDT 2009
Author: ataylor
Date: 2009-06-15 07:09:43 -0400 (Mon, 15 Jun 2009)
New Revision: 90186
Added:
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/java-ee-common-build.xml
Modified:
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties
Log:
fixed javaee examples
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-15 11:01:42 UTC (rev 90185)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-15 11:09:43 UTC (rev 90186)
@@ -116,6 +116,7 @@
<include name="examples/**"/>
</fileset>
</copy>
+ <copy tofile="${JBossMessaging2.dir}/examples/javaee/common/build.xml" file="output/etc/java-ee-common-build.xml" overwrite="true"/>
</target>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml 2009-06-15 11:01:42 UTC (rev 90185)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml 2009-06-15 11:09:43 UTC (rev 90186)
@@ -26,11 +26,13 @@
<include name="netty.jar"/>
</fileset>
</copy>
+
</target>
<target name="install-default">
<delete dir="${default.deploy.dir}/messaging"/>
<delete file="${default.deploy.dir}/jms-ra.rar"/>
+ <delete file="${default.dir}/conf/login-config.xml"/>
<mkdir dir="${default.deploy.dir}/messaging.sar"/>
<mkdir dir="${default.deploy.dir}/jms-ra.rar"/>
<mkdir dir="${default.deploy.dir}/jms-ra.rar/META-INF"/>
@@ -53,11 +55,13 @@
<include name="netty.jar"/>
</fileset>
</copy>
+ <copy todir="${default.dir}/conf" file="${non-clustered.config}/login-config.xml"/>
</target>
<target name="install-all">
<delete dir="${all.deploy.dir}/messaging"/>
<delete file="${all.deploy.dir}/jms-ra.rar"/>
+ <delete file="${all.dir}/conf/login-config.xml"/>
<mkdir dir="${all.deploy.dir}/messaging.sar"/>
<mkdir dir="${all.deploy.dir}/jms-ra.rar"/>
<mkdir dir="${all.deploy.dir}/jms-ra.rar/META-INF"/>
@@ -80,6 +84,7 @@
<include name="netty.jar"/>
</fileset>
</copy>
+ <copy todir="${all.dir}/conf" file="${clustered.config}/login-config.xml"/>
</target>
</project>
\ No newline at end of file
Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/java-ee-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/java-ee-common-build.xml (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/java-ee-common-build.xml 2009-06-15 11:09:43 UTC (rev 90186)
@@ -0,0 +1,189 @@
+<?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="compile" name="javaeeexample" basedir=".">
+ <dirname property="imported.basedir" file="${ant.file.javaeeexample}"/>
+ <property file="${imported.basedir}/config/ant.properties"/>
+ <property name="example.config.dir" value="config"/>
+ <property file="${example.config.dir}/ant.properties"/>
+ <property name="example.server.dir" value="server"/>
+ <property environment="ENV"/>
+ <property name="jboss.home" value="../../../../"/>
+
+ <!--
+ This module is based on Java 1.5
+ -->
+
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+
+ <property name="javac.debug" value="true"/>
+ <property name="javac.optimize" value="false"/>
+ <property name="javac.depend" value="false"/>
+ <property name="javac.verbose" value="false"/>
+ <property name="javac.deprecation" value="true"/>
+ <property name="javac.include.ant.runtime" value="false"/>
+ <property name="javac.include.java.runtime" value="true"/>
+ <property name="javac.fail.onerror" value="true"/>
+
+ <property name="src.dir" value="src"/>
+ <property name="example.classname" value="this.shouldn't.be.run.directly"/>
+ <property name="jbm.example.runServer" value="true"/>
+ <property name="jbm.example.beans.file" value="server0"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="config.dir" value="${imported.basedir}/config"/>
+ <property name="example.config.dir" value="config"/>
+
+ <path id="jms.compilation.classpath">
+ <fileset dir="${jbm.jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/server/default/lib">
+ <include name="netty*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="jms.runtime.classpath">
+ <path refid="jms.compilation.classpath"/>
+ <pathelement location="${config.dir}"/>
+ <pathelement location="${example.config.dir}"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac destdir="${classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.dir}"/>
+ </src>
+ <classpath refid="jms.compilation.classpath"/>
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile">
+ <jar destfile="${build.dir}/${example.name}-example.jar"
+ basedir="${classes.dir}"
+ includes="org/jboss/javaee/example/server/**/*">
+ </jar>
+ </target>
+
+ <target name="war" depends="jar">
+ <jar destfile="${build.dir}/${example.name}-example.war" basedir="${example.config.dir}"
+ includes="WEB-INF/**/*"/>
+ </target>
+
+ <target name="ear" depends="war">
+ <jar destfile="${build.dir}/${example.name}-example.ear" basedir="${build.dir}">
+ <include name="${example.name}-example.jar"/>
+ <include name="${example.name}-example.war"/>
+ <fileset dir="${example.config.dir}">
+ <include name="META-INF/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="deploy" depends="validate-jboss, copy-profile, copy-resources, ear">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <copy todir="${example-profile}/deploy/messaging.sar">
+ <fileset dir="${example.server.dir}"/>
+ </copy>
+ <copy todir="${example-profile}/deploy/">
+ <fileset dir="${build.dir}">
+ <include name="${example.name}-example.ear"/>
+ </fileset>
+ </copy>
+ <exec dir="${jboss.home}/bin" executable="sh">
+ <arg line="run.sh -c ${example.name}-example-profile"/>
+ </exec>
+ </target>
+
+ <target name="copy-profile" depends="profile.check" unless="donot.copy.profile">
+ <property name="profile" value="${jboss.home}/server/default"/>
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <property name="deploy.dir" value="${example-profile}/deploy/"/>
+ <mkdir dir="${example-profile}"/>
+ <copy todir="${example-profile}">
+ <fileset dir="${profile}">
+ <exclude name="**/*jbm-configuration.xml"/>
+ <exclude name="**/*jbm-jms.xml"/>
+ <exclude name="**/*jbm-users.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- can be overriden if the example requires to copy resources after the
+ profile is created and before the server is started -->
+ <target name="copy-resources">
+ </target>
+
+ <target name="profile.check">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <condition property="donot.copy.profile">
+ <available file="${example-profile}" type="dir"/>
+ </condition>
+ </target>
+
+ <target name="undeploy" depends="validate-jboss">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <delete dir="${example-profile}"/>
+ </target>
+
+ <target name="validate-jboss">
+ <available property="default-config" type="dir" file="${jboss.home}/server/default"/>
+ <fail unless="default-config" message="${jboss.home}/server/default not found!"/>
+ </target>
+
+ <target name="runExample" depends="validate-jboss,compile">
+ <java classname="${example.classname}" fork="true">
+ <classpath refid="jms.runtime.classpath"/>
+ </java>
+
+ </target>
+
+ <target name="clean">
+ <delete dir="./build" quiet="true"/>
+ </target>
+
+</project>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties 2009-06-15 11:01:42 UTC (rev 90185)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties 2009-06-15 11:09:43 UTC (rev 90186)
@@ -1,5 +1,5 @@
jbm.example.logserveroutput=true
-jbm.jars.dir=${imported.basedir}/../../../../../JBossMessaging2
+jbm.jars.dir=${imported.basedir}/../../../../JBossMessaging2
jars.dir=${imported.basedir}/../../../../../server/lib
-client.jars.dir=${imported.basedir}/../../../../../JBossMessaging2
+client.jars.dir=${imported.basedir}/../../../../JBossMessaging2
aio.library.path=${imported.basedir}/../../native/bin
More information about the jboss-cvs-commits
mailing list