[jboss-svn-commits] JBL Code SVN: r5540 - in labs/jbossesb/trunk/product: . config config/conf config/deploy config/lib core/common/tests/src/org/jboss/soa/esb/common/tests core/services lib
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 7 10:20:49 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-08-07 10:20:46 -0400 (Mon, 07 Aug 2006)
New Revision: 5540
Added:
labs/jbossesb/trunk/product/config/build.xml
labs/jbossesb/trunk/product/config/conf/
labs/jbossesb/trunk/product/config/conf/jbossEsb.properties
labs/jbossesb/trunk/product/config/deploy/
labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml
labs/jbossesb/trunk/product/config/deploy/properties-service.xml
labs/jbossesb/trunk/product/config/deployment.properties-example
labs/jbossesb/trunk/product/config/lib/
labs/jbossesb/trunk/product/config/lib/properties-plugin.jar
Removed:
labs/jbossesb/trunk/product/deployment.properties-example
labs/jbossesb/trunk/product/lib/deploy/
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/config/
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/product/core/services/build.xml
Log:
Adding deployment script
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/build.xml 2006-08-07 14:20:46 UTC (rev 5540)
@@ -12,13 +12,16 @@
<!-- Set default properties filename -->
<property name="org.jboss.esb.properties" value="product.properties"/>
+ <property name="org.jboss.esb.deployment.properties" value="deployment.properties"/>
+
<!-- Some default build locations -->
<property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
<property name="org.jboss.esb.internal.jar.dest" value="${basedir}/build/dist/lib"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
+ <property file="config/${org.jboss.esb.deployment.properties}"/>
<!-- Set internal property defaults -->
@@ -57,7 +60,7 @@
<!-- Path names -->
<property name="org.jboss.esb.internal.core" value="esb"/>
<property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
+ <property name="org.jboss.esb.internal.jar" value="${basedir}/lib"/>
<property name="org.jboss.esb.internal.javadocs.dest" value="${basedir}/build/dist/javadocs"/>
<!-- Initialisation -->
@@ -126,15 +129,14 @@
</javadoc>
</target>
- <target name="install" depends="org.jboss.esb.jar">
+ <target name="dist" depends="org.jboss.esb.jar">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
<echo message="Installing jar files"/>
<mkdir dir="${org.jboss.esb.installationdirectory}/lib"/>
<copy
- todir="${org.jboss.esb.installationdirectory}/lib"
- >
+ todir="${org.jboss.esb.installationdirectory}/lib">
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
@@ -184,4 +186,10 @@
<target name="jar" depends="org.jboss.esb.jar"/>
<target name="clean" depends="org.jboss.esb.clean"/>
<target name="purge" depends="org.jboss.esb.purge"/>
+
+ <target name="deploy.esb.ear" depends="dist">
+ <copy file="${org.jboss.esb.installationdirectory}/jbossesb-appl.ear"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
+ </target>
+
</project>
Property changes on: labs/jbossesb/trunk/product/config
___________________________________________________________________
Name: svn:ignore
+
deployment.properties
Added: labs/jbossesb/trunk/product/config/build.xml
===================================================================
--- labs/jbossesb/trunk/product/config/build.xml 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/config/build.xml 2006-08-07 14:20:46 UTC (rev 5540)
@@ -0,0 +1,32 @@
+<project name="JBESB_Config" default="configureJBoss" basedir=".">
+
+ <!-- Set deployment properties filename -->
+ <property name="org.jboss.esb.deployment.properties" value="deployment.properties"/>
+
+ <!-- Load Build Properties File -->
+ <property file="${org.jboss.esb.deployment.properties}"/>
+
+ <property name="org.jboss.esb.deployment.lib" value="${basedir}/lib"/>
+ <property name="org.jboss.esb.deployment.conf" value="${basedir}/conf"/>
+ <property name="org.jboss.esb.deployment.deploy" value="${basedir}/deploy"/>
+
+ <target name="configureJBoss">
+ <!-- lib -->
+ <copy file="${org.jboss.esb.deployment.lib}/${org.jboss.esb.db.driver.jar}"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/lib"/>
+ <copy file="${org.jboss.esb.deployment.lib}/properties-plugin.jar"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/lib"/>
+ <!-- conf -->
+ <copy file="${org.jboss.esb.deployment.conf}/jbossEsb.properties" overwrite="true"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/conf">
+ <filterset>
+ <filter token="esb.objstore.xml" value="${org.jboss.esb.config.objstore}" />
+ </filterset></copy>
+ <!-- deploy -->
+ <copy file="${org.jboss.esb.deployment.deploy}/JBossESB-ds.xml"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
+ <copy file="${org.jboss.esb.deployment.deploy}/properties-service.xml"
+ todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
+ </target>
+
+</project>
Added: labs/jbossesb/trunk/product/config/conf/jbossEsb.properties
===================================================================
--- labs/jbossesb/trunk/product/config/conf/jbossEsb.properties 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/config/conf/jbossEsb.properties 2006-08-07 14:20:46 UTC (rev 5540)
@@ -0,0 +1,39 @@
+#########################################################################
+# JBoss, Home of Professional Open Source
+# Copyright 2006, 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.
+#########################################################################
+
+#
+# JBoss ESB System Properties
+#
+
+#
+# Mail Notification Settings
+#
+org.jboss.soa.esb.mail.smtp.host=mail.mydomain.com
+org.jboss.soa.esb.mail.smtp.user=user
+org.jboss.soa.esb.mail.smtp.password=password
+org.jboss.soa.esb.mail.smtp.port=587
+
+
+#
+# Object Store Settings
+#
+org.jboss.soa.esb.objStore.configfile=file:@esb.objstore.xml@
\ No newline at end of file
Added: labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/config/deploy/JBossESB-ds.xml 2006-08-07 14:20:46 UTC (rev 5540)
@@ -0,0 +1,17 @@
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>JBossESBDS</jndi-name>
+
+ <connection-url>jdbc:postgresql://localhost:5432/jbossesb</connection-url>
+ <driver-class>org.postgresql.Driver</driver-class>
+ <user-name>postgres</user-name>
+ <password>postgres</password>
+
+ <min-pool-size>10</min-pool-size>
+ <max-pool-size>100</max-pool-size>
+ <blocking-timeout-millis>1000</blocking-timeout-millis>
+ <idle-timeout-minutes>5</idle-timeout-minutes>
+
+ </local-tx-datasource>
+
+</datasources>
Added: labs/jbossesb/trunk/product/config/deploy/properties-service.xml
===================================================================
--- labs/jbossesb/trunk/product/config/deploy/properties-service.xml 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/config/deploy/properties-service.xml 2006-08-07 14:20:46 UTC (rev 5540)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+<!-- $Id: properties-service.xml,v 1.5 2003/08/27 04:34:12 patriot1burke Exp $ -->
+
+<server>
+
+ <!-- ==================================================================== -->
+ <!-- PropertyEditorManager Service -->
+ <!-- ==================================================================== -->
+
+ <!--
+ | Allows access to the PropertyEditorManager, which is used when setting
+ | MBean attribute values from configuration.
+ -->
+
+ <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
+ name="jboss:type=Service,name=PropertyEditorManager">
+
+ <!--
+ | Register and editor for each of the type_name=editor_type_name listed
+ | in properties file style convetion.
+
+ <attribute name="Editors">
+ java.net.URL=my.project.editors.URLPropertyEditor
+ </attribute>
+
+ -->
+
+ </mbean>
+
+
+ <!-- ==================================================================== -->
+ <!-- System Properties Service -->
+ <!-- ==================================================================== -->
+
+ <!--
+ | Allows rich access to system properties.
+ -->
+
+ <mbean code="org.jboss.varia.property.SystemPropertiesService"
+ name="jboss:type=Service,name=SystemProperties">
+
+
+ <!-- Load JBESB properties -->
+ <attribute name="URLList">
+ ./conf/jbossEsb.properties
+ </attribute>
+
+ <!--
+ | Load properties from each of the given comma seperated URLs
+
+ <attribute name="URLList">
+ http://somehost/some-location.properties,
+ ./conf/somelocal.properties
+ </attribute>
+
+ -->
+
+ <!--
+ | Set raw properties file style properties.
+
+ <attribute name="Properties">
+
+ my.project.property=This is the value of my property
+ my.project.anotherProperty=This is the value of my other property
+
+ </attribute>
+
+ -->
+
+ </mbean>
+
+</server>
Added: labs/jbossesb/trunk/product/config/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/config/deployment.properties-example 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/config/deployment.properties-example 2006-08-07 14:20:46 UTC (rev 5540)
@@ -0,0 +1,62 @@
+######################################################################
+# JBossESB ant deployment properties file
+#
+# Copy the example file and replace with your values
+#
+######################################################################
+# APP SERVER
+######################################################################
+#
+# application server root directory
+org.jboss.esb.appserver.home=C:/Program Files/jboss-4.0.4.GA
+# server configuration
+# jboss : default or all
+org.jboss.esb.appserver.config=default
+# reference to jboss esb configuration file
+org.jboss.esb.config.objstore=/cygwin/home/kstam/dev1.6/loanbrokerdemo/conf/ObjStore.xml
+#
+######################################################################
+# PRODUCTION DATABASE
+######################################################################
+# For beta1 we only support postgres. However it should work for other
+# databases too.
+#
+# postgres : pg74.216.jdbc2ee.jar
+org.jboss.esb.db.driver.jar=pg74.216.jdbc2ee.jar
+# database driver
+# postgres : org.postgresql.Driver
+# oracle : oracle.jdbc.driver.OracleDriver
+org.jboss.esb.db.driver.class=org.postgresql.Driver
+# database url
+# postgres : jdbc:postgresql://localhost:5432/jbossesb
+# oracle : jdbc:oracle:thin:@localhost:1523:jbossesb
+org.jboss.esb.db.url=jdbc:postgresql://localhost:5432/jbossesb
+# database user
+org.jboss.esb.db.user=postgres
+# database password
+org.jboss.esb.db.password=postgres
+#
+######################################################################
+# TEST DATABASE
+######################################################################
+# For beta1 we only support postgres. However it should work for other
+# databases too.
+#
+# postgres : pg74.216.jdbc2ee.jar
+org.jboss.esb.test.db.driver.jar=pg74.216.jdbc2ee.jar
+# database driver
+# postgres : org.postgresql.Driver
+# oracle : oracle.jdbc.driver.OracleDriver
+org.jboss.esb.test.db.driver.class=org.postgresql.Driver
+# database url
+# postgres : jdbc:postgresql://localhost:5432/jbossesb
+# oracle : jdbc:oracle:thin:@localhost:1523:jbossesb
+org.jboss.esb.test.db.url=jdbc:postgresql://localhost:5432/jbossesb
+# database user
+org.jboss.esb.test.db.user=postgres
+# database password
+org.jboss.esb.test.db.password=postgres
+#
+######################################################################
+
+
Added: labs/jbossesb/trunk/product/config/lib/properties-plugin.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/config/lib/properties-plugin.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-08-07 14:20:46 UTC (rev 5540)
@@ -37,16 +37,16 @@
public class BaseTest extends TestCase {
/** The Database driver used for unit tests */
- public static String DB_DRIVER = "org.jboss.esb.db.driver";
+ public static String DB_DRIVER = "org.jboss.esb.test.db.driver.class";
/** The Database connection url used for unit tests */
- public static String DB_URL = "org.jboss.esb.db.url";
+ public static String DB_URL = "org.jboss.esb.test.db.url";
/** The Database user name used for unit tests */
- public static String DB_USERNAME = "org.jboss.esb.db.username";
+ public static String DB_USERNAME = "org.jboss.esb.test.db.username";
/** The Database password used for unit tests */
- public static String DB_PASSWORD = "org.jboss.esb.db.password";
+ public static String DB_PASSWORD = "org.jboss.esb.test.db.password";
/** The Logger. */
protected Logger log = Logger.getLogger(getClass());
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-08-07 14:20:46 UTC (rev 5540)
@@ -136,54 +136,6 @@
<!-- =================================================================== -->
- <!-- Initialise -->
- <!-- =================================================================== -->
- <target name="ejb3doclet" depends="org.jboss.esb.services.initXdoclet">
-
- <echo>+---------------------------------------------------+</echo>
- <echo>| |</echo>
- <echo>| R U N N I N G E J B D O C L E T |</echo>
- <echo>| |</echo>
- <echo>+---------------------------------------------------+</echo>
-
- <ejbdoclet
- destdir="src"
- mergedir="parent-fake-to-debug"
- ejbspec="2.0"
- excludedTags="@version, at author, at todo"
- force="false"
- verbose="false"
- addedTags="@xdoclet-generated at ${TODAY}, at copyright The XDoclet Team, at author XDoclet, at version ${version}"
- >
-
- <remoteinterface/>
- <localinterface/>
- <homeinterface/>
- <localhomeinterface/>
-
- <fileset dir="src">
- <include name="**/*Bean.java"/>
- </fileset>
-
- <deploymentdescriptor
- destdir="${org.jboss.esb.services.metainf.dir}"
- validatexml="true"
- mergedir="fake-to-debug"
- description="Jboss ESB"
- >
- </deploymentdescriptor>
-
- <jboss
- version="3.2"
- xmlencoding="iso-8859-1"
- destdir="${org.jboss.esb.services.metainf.dir}"
- validatexml="true"
- />
-
- </ejbdoclet>
- </target>
-
- <!-- =================================================================== -->
<!-- Jar -->
<!-- =================================================================== -->
<target name="jar" description="Assemble jar files"
@@ -199,7 +151,7 @@
</target>
<target name="-ear">
- <ear destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-appl.ear"
+ <ear destfile="${org.jboss.esb.services.dist.dir}/jbossesb-appl.ear"
appxml="${org.jboss.esb.services.metainf.dir}/application.xml">
<fileset dir="${org.jboss.esb.services.dist.dir}"
includes="jbossesb-common.jar
Deleted: labs/jbossesb/trunk/product/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/deployment.properties-example 2006-08-07 14:19:02 UTC (rev 5539)
+++ labs/jbossesb/trunk/product/deployment.properties-example 2006-08-07 14:20:46 UTC (rev 5540)
@@ -1,21 +0,0 @@
-######################################################################
-# JBossESB ant deployment properties file
-#
-# Copy the example file and replace with your values
-#
-######################################################################
-#
-# application server root directory
-org.jboss.esb.jboss.home=C:\Program Files\jboss-4.0.4.GA
-# jboss server configuration
-org.jboss.esb.jboss.server.config=default
-# database driver
-org.jboss.esb.db.driver=org.postgresql.Driver
-# database url
-org.jboss.esb.db.url=jdbc:postgresql://localhost:5432/jbossesb
-# database user
-org.jboss.esb.db.user=postgres
-# database password
-org.jboss.esb.db.password=postgres
-#
-
More information about the jboss-svn-commits
mailing list