[jboss-svn-commits] JBL Code SVN: r11564 - in labs/jbossesb/trunk/product/install: DMQ and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 1 15:11:09 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-05-01 15:11:09 -0400 (Tue, 01 May 2007)
New Revision: 11564
Added:
labs/jbossesb/trunk/product/install/DMQ/
labs/jbossesb/trunk/product/install/DMQ/jbm-queue-service.xml
labs/jbossesb/trunk/product/install/DMQ/jbmq-queue-service.xml
labs/jbossesb/trunk/product/install/tomcat/context.xml
labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml
labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml
labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigListener.java
Removed:
labs/jbossesb/trunk/product/install/tomcat/jbossesb.xml
labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java
Modified:
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/install/deployment.properties-example
labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql
labs/jbossesb/trunk/product/install/tomcat/README.txt
labs/jbossesb/trunk/product/install/tomcat/juddi.properties
labs/jbossesb/trunk/product/install/tomcat/log4j.xml
labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/web.xml
Log:
Commit of war changes: JBESB-369
Added: labs/jbossesb/trunk/product/install/DMQ/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/DMQ/jbm-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/DMQ/jbm-queue-service.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DeadMessageQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+</server>
Property changes on: labs/jbossesb/trunk/product/install/DMQ/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/install/DMQ/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/DMQ/jbmq-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/DMQ/jbmq-queue-service.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=DeadMessageQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Property changes on: labs/jbossesb/trunk/product/install/DMQ/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/build.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -8,7 +8,7 @@
<property file="${org.jboss.esb.deployment.properties}"/>
<target name="deploy" depends="sar.deploy,jboss-esb.war.deploy" description="Wrapper for jboss.sar.deploy"/>
- <target name="tomcat" depends="tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
+ <target name="tomcat" depends="tomcat.compile, tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
<target name="sar.deploy" description="Deploys JBossESB to the server">
<copy todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
@@ -20,10 +20,22 @@
<fileset dir="${org.jboss.esb.dist.lib}" includes="jboss-esb.war"/></copy>
</target>
+ <property name="org.jboss.esb.tomcat.55lib"
+ location="${org.jboss.esb.tomcat.home}/common/lib"/>
+ <property name="org.jboss.esb.tomcat.60lib"
+ location="${org.jboss.esb.tomcat.home}/lib"/>
+
+ <available property="org.jboss.esb.tomcat.lib"
+ file="${org.jboss.esb.tomcat.55lib}"
+ value="${org.jboss.esb.tomcat.55lib}"/>
+ <available property="org.jboss.esb.tomcat.lib"
+ file="${org.jboss.esb.tomcat.60lib}"
+ value="${org.jboss.esb.tomcat.60lib}"/>
+
<!-- Tomcat war deployment -->
<path id="classpath">
<fileset dir="${org.jboss.esb.dist.lib}" includes="**/*jar"/>
- <fileset dir="${org.jboss.esb.tomcat.home}/common/lib" includes="**/*jar"/>
+ <fileset dir="${org.jboss.esb.tomcat.lib}" includes="**/*jar"/>
</path>
<target name="tomcat.compile">
@@ -37,37 +49,32 @@
<target name="tomcat.war.all.deploy" description="Deploys a jbossesb.war to tomcat">
<!-- conf -->
- <copy file="tomcat/log4j.xml" overwrite="true"
- todir="${org.jboss.esb.tomcat.home}/conf/" />
- <copy file="${org.jboss.esb.deployment.conf}/jbossesb-properties.xml" overwrite="true"
- todir="${org.jboss.esb.tomcat.home}/conf/" />
- <copy file="${org.jboss.esb.deployment.conf}/jbossesb.xml" overwrite="true"
- todir="${org.jboss.esb.tomcat.home}/conf/" />
- <copy file="tomcat/juddi.properties" overwrite="true"
- todir="${org.jboss.esb.tomcat.home}/conf/" />
+ <copy todir="${org.jboss.esb.tomcat.home}/conf" overwrite="true">
+ <fileset dir="tomcat" includes="jbossesb-properties.xml, jboss-esb.xml, juddi.properties" />
+ </copy>
- <copy file="./tomcat/jbossesb.xml" overwrite="true"
- todir="${org.jboss.esb.tomcat.home}/conf/Catalina/localhost/" />
<mkdir dir="${org.jboss.esb.tomcat.home}/webapps/jbossesb"/>
<copy todir="${org.jboss.esb.tomcat.home}/webapps/jbossesb" overwrite="true">
- <fileset dir="./tomcat/war/" includes="**/*" />
+ <fileset dir="tomcat/war/" includes="**/*" />
</copy>
+
+ <mkdir dir="${org.jboss.esb.tomcat.home}/webapps/jbossesb/META-INF"/>
+ <copy file="tomcat/context.xml" overwrite="true"
+ todir="${org.jboss.esb.tomcat.home}/webapps/jbossesb/META-INF/" />
+
+ <copy todir="${org.jboss.esb.tomcat.home}/webapps/jbossesb/WEB-INF/classes">
+ <fileset dir="tomcat" includes="log4j.xml"/>
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar" includes="repository.xml, smooks-cdr.lst"/>
+ </copy>
+
<copy todir="${org.jboss.esb.tomcat.home}/webapps/jbossesb/WEB-INF/lib" overwrite="true">
- <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb*.jar"
+ <!-- ext jar files -->
+ <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="jaxr-api-1.0-SNAPSHOT.jar, commons-discovery.jar,
+ juddi-*.jar,jbossall-client.jar, log4j.jar,
+ commons-logging.jar, commons-discovery.jar"/>
+ <!-- jbossesb.sar jar files -->
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar/lib" includes="*.jar"
excludes="jbossesb-dependencies.jar" />
- <!-- properties-file reader -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="jbossts-common.jar"/>
- <!-- jaxr and scout -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="jaxr-api-1.0-SNAPSHOT.jar,
- scout-1.0-SNAPSHOT.jar,xbean.jar,xmlpublic.jar,stax-api-*.jar,commons-discovery.jar,jbossts-common.jar,
- jaxr-api-*.jar,scout-*.jar,juddi-*.jar,jbossall-client.jar,log4j.jar"/>
- <!-- JBoss Rules -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext"
- includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
- drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
- commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
- <!-- Smooks -->
- <fileset dir="${org.jboss.esb.dist.lib}/ext" includes="${smooks.dependencies}"/>
</copy>
</target>
Modified: labs/jbossesb/trunk/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/install/deployment.properties-example 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/deployment.properties-example 2007-05-01 19:11:09 UTC (rev 11564)
@@ -21,7 +21,7 @@
######################################################################
# Server home directory
# (By default the 'ant install' task will create this directory.)
-org.jboss.esb.server.home=/jbossesb-server-4.2.MP1
+org.jboss.esb.server.home=/home/kevin/testing/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA/
# the instance of jboss you are running (default)
org.jboss.esb.server.config=default
######################################################################
Modified: labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql 2007-05-01 19:11:09 UTC (rev 11564)
@@ -1,4 +1,9 @@
+CREATE DATABASE jbossesb;
+GRANT ALL PRIVILEGES ON jbossesb.* TO 'jbossesb' IDENTIFIED BY 'jbossesb';
+
+USE jbossesb;
+
CREATE TABLE message
(
uuid varchar(128) NOT NULL,
@@ -7,4 +12,4 @@
delivered varchar(10) NOT NULL,
classification varchar(10),
PRIMARY KEY (`uuid`)
-);
\ No newline at end of file
+);
Modified: labs/jbossesb/trunk/product/install/tomcat/README.txt
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/README.txt 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/README.txt 2007-05-01 19:11:09 UTC (rev 11564)
@@ -6,19 +6,31 @@
in your deployment.properties file.
-2. Update the database info in the tomcat/jbossesb.xml file to point to your
- juddi database (you need to run the sql scripts in the jUDDI-registry directory
- first to populate it):
+2. Update the database info in the context.xml file to point to your
+ juddi and message store databases (you need to run the sql scripts in the
+ jUDDI-registry and message-store directories first to populate them).
<Resource name="jdbc/juddiDB" auth="Container" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000" username="juddi"
password="juddi" driverClassName="org.gjt.mm.mysql.Driver"
url="jdbc:mysql://localhost:3306/juddi?autoReconnect=true" />
+
+ <Resource name="jdbc/JBossesbDS" auth="Container" type="javax.sql.DataSource"
+ maxActive="100" maxIdle="30" maxWait="10000" username="jbossesb"
+ password="jbossesb" driverClassName="org.gjt.mm.mysql.Driver"
+ url="jdbc:mysql://localhost:3306/jbossesb?autoReconnect=true" />
+
- This file will be copied to the tomcat.home/conf/Catalina/localhost directory.
+ This file will be copied into the META-INF directory of the web app.
-3. Add the database driver to the tomcat.home/common/lib/ directory.
+3. Edit jboss-esb.xml to configure the JMS properties for the jms-provider.
+ (configurations for JBossMQ and JBoss Messaging are provided in DMQ)
-4. Run the ant war.all.deploy task. This creates a jbossesb.war and the configration for tomcat.
+4. Start your JMS server. (You may need to check port assignments if both are
+ running on the same machine.)
-5. Launch tomcat.
+5. Add the database driver and JMS libraries to the tomcat.home/common/lib/ directory.
+
+6. Run the ant tomcat task. This creates a jbossesb.war and the configration for tomcat.
+
+7. Launch tomcat.
Copied: labs/jbossesb/trunk/product/install/tomcat/context.xml (from rev 11503, labs/jbossesb/trunk/product/install/tomcat/jbossesb.xml)
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/context.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/tomcat/context.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Context path="/jbossesb" docBase="${catalina.home}/webapps/jbossesb"
+ debug="5" reloadable="true" crossContext="true">
+ <Logger className="org.apache.catalina.logger.FileLogger"
+ prefix="jbossesb_log" suffix=".txt"
+ timestamp="true"/>
+ <!-- the Resource element will probably work better for you on Tomcat 5+ if
+ you simply use a Resource only tag
+ with xml attributes as opposed to the nested ResourceParams and parameter
+ elements -->
+ <Resource name="jdbc/juddiDB" auth="Container" type="javax.sql.DataSource"
+ maxActive="100" maxIdle="30" maxWait="10000" username="juddi"
+ password="juddi" driverClassName="org.gjt.mm.mysql.Driver"
+ url="jdbc:mysql://localhost:3306/juddi?autoReconnect=true" />
+
+ <Resource name="jdbc/JBossesbDS" auth="Container" type="javax.sql.DataSource"
+ maxActive="100" maxIdle="30" maxWait="10000" username="jbossesb"
+ password="jbossesb" driverClassName="org.gjt.mm.mysql.Driver"
+ url="jdbc:mysql://localhost:3306/jbossesb?autoReconnect=true" />
+</Context>
Added: labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,50 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="50">
+ <!--
+ jbossesb internal services
+ -->
+
+ <providers>
+ <jms-provider name="Default-JMS-Provider" connection-factory="ConnectionFactory"
+ jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+ jndi-URL="localhost" >
+
+ <jms-bus busid="DeadMessageQueue">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/DeadMessageQueue"
+ />
+ </jms-bus>
+ </jms-provider>
+ </providers>
+
+ <services>
+ <service category="JBossESB-Internal"
+ name="DeadLetterService"
+ description="Dead Messages can be send to this service, which is configured to store and/or
+ notify" >
+ <listeners>
+ <jms-listener name="JMS-DLQListener"
+ busidref="DeadMessageQueue"
+ maxThreads="1"
+ />
+ </listeners>
+ <actions>
+ <action name="PersistAction"
+ class="org.jboss.soa.esb.actions.MessagePersister" >
+ <property name="classfication" value="DLQ"/>
+ <property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
+ </action>
+ <action name="notificationAction"
+ class="org.jboss.soa.esb.actions.Notifier">
+ <property name="okMethod" value="notifyOK" />
+ <property name="notification-details">
+ <NotificationList>
+ <target class="NotifyConsole" />
+ </NotificationList>
+ </property>
+ </action>
+ </actions>
+ </service>
+ </services>
+</jbossesb>
Property changes on: labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,92 @@
+<?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: jbossesb-unittest-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.context.factory" value="org.apache.naming.java.javaURLContextFactory"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ <property name="org.jboss.soa.esb.jndi.server.pkg.prefix" value="org.apache.naming"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.registry.password" value="password"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ </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="jbossesb"/>
+ <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.ftp.localdir" value="/tmp"/>
+ <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool=size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="dbstore">
+
+ <!-- connection manager type -->
+ <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/ -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/>
+
+ <!-- this property is only used if using the j2ee connection manager -->
+ <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:comp/env/jdbc/JBossesbDS"/>
+
+ <!-- standalone connection pooling settings -->
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+
+ </properties>
+ <properties name="messagerouting">
+ <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+ </properties>
+ <properties name="filters">
+ <property name="org.jboss.soa.esb.courier.filter.1" value="org.jboss.internal.soa.esb.message.metadata.MetaDataFilter"/>
+ </properties>
+</esb>
Property changes on: labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/trunk/product/install/tomcat/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/jbossesb.xml 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/jbossesb.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Context docBase="${catalina.home}/webapps/jbossesb" debug="5" reloadable="true"
- crossContext="true">
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="jbossesb_log" suffix=".txt"
- timestamp="true"/>
- <!-- the Resource element will probably work better for you on Tomcat 5+ if
- you simply use a Resource only tag
- with xml attributes as opposed to the nested ResourceParams and parameter
- elements -->
- <Resource name="jdbc/juddiDB" auth="Container" type="javax.sql.DataSource"
- maxActive="100" maxIdle="30" maxWait="10000" username="juddi"
- password="juddi" driverClassName="org.gjt.mm.mysql.Driver"
- url="jdbc:mysql://localhost:3306/juddi?autoReconnect=true" />
-</Context>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/install/tomcat/juddi.properties
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/juddi.properties 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/juddi.properties 2007-05-01 19:11:09 UTC (rev 11564)
@@ -9,7 +9,7 @@
juddi.i18n.countryCode = US
# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+juddi.discoveryURL = http://localhost:8080/jbossesb/uddiget.jsp?
# The UDDI Operator Contact Email Address
juddi.operatorEmailAddress = admin at juddi.org
@@ -48,9 +48,9 @@
juddi.validator=org.apache.juddi.validator.DefaultValidator
# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.adminURL = http://localhost:8080/jbossesb/admin
+juddi.proxy.inquiryURL = http://localhost:8080/jbossesb/inquiry
+juddi.proxy.publishURL = http://localhost:8080/jbossesb/publish
juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
Modified: labs/jbossesb/trunk/product/install/tomcat/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/log4j.xml 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/log4j.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -23,7 +23,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="../logs/server.log"/>
+ <param name="File" value="${catalina.home}/logs/jbossesb.log"/>
<param name="Append" value="false"/>
<!-- Rollover at midnight each day -->
Deleted: labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigControllerService.java 2007-05-01 19:11:09 UTC (rev 11564)
@@ -1,90 +0,0 @@
-/*
- * 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 kurt.stam at jboss.com
- */
-package org.jboss.soa.esb.servlet;
-
-import java.io.File;
-import java.net.URI;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.listeners.config.ConfigurationController;
-
-/**
- * @author Kurt Stam (kurt.stam at redhat.com)
- */
-public class ConfigControllerService extends HttpServlet
-{
- private String configurationFile="jbossesb.xml";
- /** Logger */
- private static Log log = LogFactory.getLog(ConfigControllerService.class);
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public void init() throws ServletException
- {
- try {
- super.init();
- log.info("Hello ConfigController");
- log.info("starting message configuration controller with config file " + configurationFile);
- String confDir = "";
-
- if (System.getProperty("catalina.home")!=null) {
- String url = System.getProperty("catalina.home") + "/conf/";
- url = url.replace('\\','/');
- log.info(url);
- URI uri = new URI(url);
- confDir = uri.getPath();
- }
-
- String loggerConfig = confDir + "log4j.xml";
- log.info("Reading log4.xml from: " + loggerConfig);
- DOMConfigurator.configure(loggerConfig);
-
- System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "on");
- File propertiesFile = new File(confDir + "jbossesb-properties.xml");
- System.setProperty("org.jboss.soa.esb.propertyFile", "abs://" + propertiesFile.getAbsolutePath());
- log.info("Reading jbossesb-properties.xml from: " + propertiesFile.getAbsolutePath());
- if (log.isDebugEnabled()) {
- log.debug(Configuration.dump());
- }
-
- String configFile = confDir + configurationFile;
- System.setProperty("juddi.propertiesFile", confDir + "juddi.properties");
- log.info("Reading juddi.properties from: " + confDir + "juddi.properties");
-
- log.info("Starting Config Controller: " + configFile);
- ConfigurationController configurationController = new ConfigurationController(configFile,null);
- new Thread(configurationController).start();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
-}
Added: labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigListener.java
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigListener.java (rev 0)
+++ labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigListener.java 2007-05-01 19:11:09 UTC (rev 11564)
@@ -0,0 +1,84 @@
+package org.jboss.soa.esb.servlet;
+
+import java.io.File;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.listeners.config.ConfigurationController;
+
+/**
+ * Context listener used to configure the ESB in a war environment.
+ * @author kevin
+ */
+public class ConfigListener implements ServletContextListener
+{
+ /**
+ * The configuration controller.
+ */
+ private ConfigurationController configurationController ;
+
+ /**
+ * Initialise the ESB.
+ * @param servletContextEvent The initialised context event.
+ */
+ public void contextInitialized(final ServletContextEvent servletContextEvent)
+ {
+ final ServletContext servletContext = servletContextEvent.getServletContext() ;
+
+ servletContext.log("Initialising ESB Configuration Controller") ;
+ final String catalinaHome = System.getProperty("catalina.home") ;
+ if (catalinaHome == null)
+ {
+ servletContext.log("***** Error initialising context, catalina home not set") ;
+ }
+ else
+ {
+ final File catalinaHomeDir = new File(catalinaHome) ;
+ final File confDir = new File(catalinaHomeDir, "conf") ;
+
+ final File propertyFile = new File(confDir, "jbossesb-properties.xml") ;
+ final String absPropertyFile = propertyFile.getAbsolutePath() ;
+
+ System.setProperty(Environment.PROPERTIES_FILE, "abs://" + absPropertyFile) ;
+ System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "on") ;
+
+ servletContext.log("ESB Property configuration obtained from file: " + absPropertyFile);
+
+ final File juddiPropertyFile = new File(confDir, "juddi.properties") ;
+ final String absJuddiPropertyFile = juddiPropertyFile.getAbsolutePath() ;
+ System.setProperty("juddi.propertiesFile", absJuddiPropertyFile) ;
+
+ servletContext.log("ESB juddi configuration obtained from file: " + absJuddiPropertyFile) ;
+
+ final File configFile = new File(confDir, "jboss-esb.xml") ;
+ final String absConfigFile = configFile.getAbsolutePath() ;
+
+ servletContext.log("ESB configuration obtained from file: " + absConfigFile) ;
+
+ configurationController = new ConfigurationController(absConfigFile, null) ;
+ new Thread(configurationController).start() ;
+ }
+ }
+
+ /**
+ * Terminate the ESB.
+ * @param servletContextEvent The destroyed context event.
+ */
+ public void contextDestroyed(final ServletContextEvent servletContextEvent)
+ {
+ if (configurationController != null)
+ {
+ final ServletContext servletContext = servletContextEvent.getServletContext() ;
+
+ servletContext.log("ESB starting termination") ;
+
+ configurationController.requestEnd() ;
+ configurationController.waitUntilEnded() ;
+
+ servletContext.log("ESB terminated") ;
+ }
+ }
+}
Property changes on: labs/jbossesb/trunk/product/install/tomcat/src/org/jboss/soa/esb/servlet/ConfigListener.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/web.xml 2007-05-01 18:35:10 UTC (rev 11563)
+++ labs/jbossesb/trunk/product/install/tomcat/war/WEB-INF/web.xml 2007-05-01 19:11:09 UTC (rev 11564)
@@ -11,11 +11,9 @@
JBossESB - JBoss Enterprise Service Bus
</description>
- <servlet>
- <servlet-name>ConfigControllerService</servlet-name>
- <servlet-class>org.jboss.soa.esb.servlet.ConfigControllerService</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <listener>
+ <listener-class>org.jboss.soa.esb.servlet.ConfigListener</listener-class>
+ </listener>
<welcome-file-list id="WelcomeFileList">
<welcome-file>index.jsp</welcome-file>
@@ -30,4 +28,11 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
+ <resource-ref>
+ <description>Message Store DataSource</description>
+ <res-ref-name>jdbc/JBossesbDS</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
</web-app>
More information about the jboss-svn-commits
mailing list