[jboss-svn-commits] JBL Code SVN: r6573 - in labs/jbossesb/trunk: product product/core/listeners/tests product/core/rosetta/tests product/core/services/tests product/docs/Install product/etc product/install product/install/conf product/install/deploy product/lib/ext qa qa/junit
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 4 09:14:37 EDT 2006
Author: tfennelly
Date: 2006-10-04 09:13:54 -0400 (Wed, 04 Oct 2006)
New Revision: 6573
Added:
labs/jbossesb/trunk/product/install/
labs/jbossesb/trunk/product/install/README.TXT
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/install/database/
labs/jbossesb/trunk/product/lib/ext/hsqldb.jar
labs/jbossesb/trunk/product/lib/ext/pg74.216.jdbc2ee.jar
labs/jbossesb/trunk/product/lib/ext/properties-plugin.jar
Removed:
labs/jbossesb/trunk/product/config/
labs/jbossesb/trunk/product/docs/Install/README.TXT
labs/jbossesb/trunk/product/docs/Install/database/
labs/jbossesb/trunk/product/etc/jbossesb-properties.xml
labs/jbossesb/trunk/product/install/conf/jbossEsb.properties
labs/jbossesb/trunk/product/install/data/
labs/jbossesb/trunk/product/install/deploy/properties-service.xml
labs/jbossesb/trunk/product/install/lib/
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/qa/build.xml
labs/jbossesb/trunk/qa/junit/build.xml
Log:
unifying "product/config" and "product/docs/install" under "product/install"
http://jira.jboss.com/jira/browse/JBESB-167
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -20,7 +20,7 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
- <property file="config/${org.jboss.esb.deployment.properties}"/>
+ <property file="install/${org.jboss.esb.deployment.properties}"/>
<!-- Set internal property defaults -->
<property name="org.jboss.esb.installationdirectory" value="${basedir}/build/dist"/>
@@ -201,11 +201,11 @@
</fileset>
</copy>
- <echo message="Installing config files"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/config"/>
+ <echo message="Installing install files"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/install"/>
<copy
- todir="${org.jboss.esb.installationdirectory}/config">
- <fileset dir="config"/>
+ todir="${org.jboss.esb.installationdirectory}/install">
+ <fileset dir="install"/>
</copy>
<echo message="Installing xml ${org.jboss.esb.installationdirectory}"/>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -8,7 +8,6 @@
<property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
- <property name="org.jboss.esb.deploy.lib.dir" value="${org.jboss.esb.root.dir}/config/lib/"/>
<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
<property name="org.jboss.esb.module.tests.conf.dir" value="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
@@ -23,7 +22,6 @@
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
- <fileset dir="../${org.jboss.esb.deploy.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -13,10 +13,8 @@
<property environment="env"/>
<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.deploy.lib.dir" value="${org.jboss.esb.root.dir}/config/lib/"/>
-
<!-- Set deployment properties filename -->
- <property name="org.jboss.esb.deployment.properties" value="../../../config/deployment.properties"/>
+ <property name="org.jboss.esb.deployment.properties" value="../../../install/deployment.properties"/>
<!-- Load deployment properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
<property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
@@ -27,8 +25,6 @@
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
- <fileset dir="../${org.jboss.esb.deploy.lib.dir}" includes="*.jar"/>
-
<pathelement location="${org.jboss.esb.root.dir}/rosetta/tests/resources/etc"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
- <property file="../../../../config/deployment.properties"/>
+ <property file="../../../../install/deployment.properties"/>
<property name="org.jboss.esb.internal.dest" value="${basedir}/../../../build"/>
Deleted: labs/jbossesb/trunk/product/docs/Install/README.TXT
===================================================================
--- labs/jbossesb/trunk/product/docs/Install/README.TXT 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/docs/Install/README.TXT 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,46 +0,0 @@
-#########################################################################
-# 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.
-#########################################################################
-
-HOW TO INSTALL JBoss ESB:
-
-
-1. Copy the <JBoss ESB Home>/dist/jbossesb-appl.ear to your <JBOSS_HOME>/server/all/deploy directory
-
-2. Edit the properties-service.xml in your <JBOSS_HOME>/server/all/deploy directory and add the following attribute entry:
- <attribute name="URLList">
- ./conf/jbossEsb.properties
- </attribute>
- * This let’s the JBoss ESB application know where to find its config file
-
-3. Copy the <JBoss ESB HOME>/docs/install/conf/jbossEsb.properties to your <JBOSS_HOME>\server\all\conf directory
-
-4. Load the database schema located in <JBoss ESB HOME>/docs/install/database/JBossESB-DB.sql into your PostGreSQL database – create a new database of your choice.
-
-5. Copy the <JBoss ESB HOME>/doc/install/\deploy/JBossESB-DS.xml to your <JBOSS_HOME>/server/all/deploy directory.
-
-6. Edit the JBossESB-DS.xml and change as required for your database settings
-
-7. Copy the PostGreSQL JDBC driver into your <JBOSS_HOME>/server/all/lib directory
-
-8. Edit the <JBOSS_HOME>/server/all/conf/jbossEsb.properties file and modify as per your environment for mail notifications to work
-
-9. Launch JBoss Application Server
Deleted: labs/jbossesb/trunk/product/etc/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/etc/jbossesb-properties.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/etc/jbossesb-properties.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, JBoss Inc., and others contributors as indicated
- by the @authors tag. All rights reserved.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
-<!-- $Id: default-jbossesb-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
- <!-- property name="org.jboss.soa.esb.paramsRepository.class" value="" -->
- <!-- property name="org.jboss.soa.esb.encryption.factory.class" value="" -->
- <!-- property name="org.jboss.soa.esb.objStore.configFile" value="" -->
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- <!-- property name="org.jboss.soa.esb.mail.smtp.from" value="" -->
- <!-- property name="org.jboss.soa.esb.mail.smtp.auth" value="" -->
- </properties>
- <properties name="connection">
- <!-- property name="isolation" value="" -->
- <!-- property name="connection-url" value="" -->
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <!-- property name="connection-pool-class" value="" -->
- <!-- property name="user-name" value="" -->
- <!-- property name="password" value="" -->
- <!-- property name"password-decrypter" value="" -->
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
-</esb>
Copied: labs/jbossesb/trunk/product/install (from rev 6572, labs/jbossesb/trunk/product/config)
Copied: labs/jbossesb/trunk/product/install/README.TXT (from rev 6572, labs/jbossesb/trunk/product/docs/Install/README.TXT)
Deleted: labs/jbossesb/trunk/product/install/conf/jbossEsb.properties
===================================================================
--- labs/jbossesb/trunk/product/config/conf/jbossEsb.properties 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/install/conf/jbossEsb.properties 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,39 +0,0 @@
-#########################################################################
-# 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=@org.jboss.soa.esb.mail.smtp.host@
-org.jboss.soa.esb.mail.smtp.port=@org.jboss.soa.esb.mail.smtp.port@
-org.jboss.soa.esb.mail.smtp.user=@org.jboss.soa.esb.mail.smtp.user@
-org.jboss.soa.esb.mail.smtp.password=@org.jboss.soa.esb.mail.smtp.password@
-
-
-#
-# Object Store Settings
-#
-org.jboss.soa.esb.objStore.configfile=file:@org.jboss.esb.config.objstore@
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml (from rev 6572, labs/jbossesb/trunk/product/etc/jbossesb-properties.xml)
Copied: labs/jbossesb/trunk/product/install/database (from rev 6572, labs/jbossesb/trunk/product/docs/Install/database)
Deleted: labs/jbossesb/trunk/product/install/deploy/properties-service.xml
===================================================================
--- labs/jbossesb/trunk/product/config/deploy/properties-service.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/product/install/deploy/properties-service.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,73 +0,0 @@
-<?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/lib/ext/hsqldb.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/hsqldb.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/lib/ext/pg74.216.jdbc2ee.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/pg74.216.jdbc2ee.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/lib/ext/properties-plugin.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/properties-plugin.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/qa/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -1,7 +1,7 @@
<project name="JBESB" default="test" basedir=".">
<property file="test.properties" />
- <property file="../product/config/deployment.properties" />
+ <property file="../product/install/deployment.properties" />
<target name="test" depends="test.junit" description="Run all QA tests." />
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2006-10-04 11:35:48 UTC (rev 6572)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2006-10-04 13:13:54 UTC (rev 6573)
@@ -17,7 +17,6 @@
<fileset dir="${qa.lib}/ext" includes="*.jar" />
<fileset dir="${build.lib}/ext" includes="*.jar" />
<fileset dir="${build.lib}/ext/ejb3" includes="*.jar" />
- <fileset dir="${product}/config/lib" includes="*.jar" />
<pathelement location="../" />
</path>
More information about the jboss-svn-commits
mailing list