[jboss-svn-commits] JBL Code SVN: r8037 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/gateway core/listeners/src/org/jboss/soa/esb/listeners/message samples/trailblazer2 samples/trailblazer2/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 1 16:26:21 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-01 16:26:17 -0500 (Fri, 01 Dec 2006)
New Revision: 8037
Added:
labs/jbossesb/trunk/product/samples/trailblazer2/jbossesb-properties.xml
Removed:
labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerService.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/EsbListenerControllerService.java
labs/jbossesb/trunk/product/samples/trailblazer2/build.xml
labs/jbossesb/trunk/product/samples/trailblazer2/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java
labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/ProcessEmail.java
Log:
fixing tb for jbossesb.sar deployment
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerService.java 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerService.java 2006-12-01 21:26:17 UTC (rev 8037)
@@ -9,7 +9,7 @@
{
private GatewayListenerController gatewayListController;
private Logger logger = Logger.getLogger(this.getClass());
- private String gatewayConfigFile="jbossesb-deployment.xml";
+ private String gatewayConfigFile="jbossesb-gateway.xml";
protected void startService() throws Exception
{
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/EsbListenerControllerService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/EsbListenerControllerService.java 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/EsbListenerControllerService.java 2006-12-01 21:26:17 UTC (rev 8037)
@@ -9,7 +9,7 @@
{
private EsbListenerController _esbListController;
private Logger _logger = Logger.getLogger(this.getClass());
- private String messageAwareConfigFile="jbossesb-deployment.xml";
+ private String messageAwareConfigFile="jbossesb-listener.xml";
protected void startService() throws Exception
{
Modified: labs/jbossesb/trunk/product/samples/trailblazer2/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/build.xml 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/build.xml 2006-12-01 21:26:17 UTC (rev 8037)
@@ -177,9 +177,6 @@
<fileset dir="${basedir}/client/jsp">
<include name="**/*.jsp"/>
</fileset>
- <fileset dir="${basedir}">
- <include name="trailblazer-properties.xml"/>
- </fileset>
<webinf dir="${basedir}/client/resources">
<include name="jboss-web.xml"/>
</webinf>
@@ -194,12 +191,14 @@
todir="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/deploy"/>
<copy file="${basedir}/esb-quickstart-service.xml" overwrite="true"
todir="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/deploy"/>
+ <copy file="${basedir}/jbossesb-properties.xml"
+ tofile="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/conf/jbossesb-properties.xml"/>
</target>
<target name="deploy-jars" depends="jar">
<copy file="${org.jboss.esb.samples.trailblazer.esb.dest}/dist/trailblazer-esb.jar"
todir="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/deploy/jbossesb.sar"/>
- <copy file="${basedir}/trailblazer-properties.xml"
+ <copy file="${basedir}/jbossesb-properties.xml"
tofile="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/conf/jbossesb-properties.xml"/>
<copy file="${basedir}/esb-quickstart-service.xml"
todir="${org.jboss.soa.samples.trailblazer.jboss_home}/server/${org.jboss.soa.samples.trailblazer.jboss_server}/deploy"/>
Modified: labs/jbossesb/trunk/product/samples/trailblazer2/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java 2006-12-01 21:26:17 UTC (rev 8037)
@@ -57,7 +57,7 @@
public LoanBroker() {
- System.setProperty("org.jboss.soa.esb.propertyFile", "trailblazer-properties.xml");
+// System.setProperty("org.jboss.soa.esb.propertyFile", "jbossesb-properties.xml");
// System.setProperty("juddi.propertiesFile", "juddi.properties");
}
Modified: labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/Launcher.java 2006-12-01 21:26:17 UTC (rev 8037)
@@ -25,7 +25,7 @@
public static void main (String args[]) throws Exception
{
// System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "ON");
- System.setProperty("org.jboss.soa.esb.propertyFile", "trailblazer-properties.xml");
+// System.setProperty("org.jboss.soa.esb.propertyFile", "trailblazer-properties.xml");
//Adding the to make it easy to run in eclipse
String arg0=null, arg1=null, arg2=null;
Modified: labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/ProcessEmail.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/ProcessEmail.java 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/esb/src/org/jboss/soa/esb/samples/trailblazer/util/ProcessEmail.java 2006-12-01 21:26:17 UTC (rev 8037)
@@ -26,6 +26,7 @@
import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
import org.apache.log4j.Logger;
+import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.common.ModulePropertyManager;
import org.jboss.soa.esb.helpers.Email;
@@ -56,7 +57,8 @@
Email emailMessage = new Email();
emailMessage.setSendTo(emailTo);
emailMessage.setSubject("TrailBlazer Quote from Bank");
- emailMessage.setFrom("jbossesb at voteforRoy.org");
+ String emailFrom = Configuration.getSmtpFrom();
+ emailMessage.setFrom(emailFrom);
// File emailTemplate = new File(LoanBrokerConstants.EMAIL_TEMPLATE);
// String quoteMsg=FileUtil.readTextFile(emailTemplate);
emailMessage.setMessage(fillTemplate());
@@ -69,11 +71,12 @@
private String fillTemplate() throws Exception{
//load up the email templates from the StringTemplate files
+ System.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "ON");
String templatePath = ModulePropertyManager.getPropertyManager("trailblazer").
getProperty("org.jboss.soa.esb.trailblazer.email.template.path");
String templateFile = ModulePropertyManager.getPropertyManager("trailblazer").
getProperty("org.jboss.soa.esb.trailblazer.email.template.file");
-
+
logger.debug("loading StringTemplate from path: "+templatePath);
logger.debug("loading StringTemplate from file: "+templateFile);
Copied: labs/jbossesb/trunk/product/samples/trailblazer2/jbossesb-properties.xml (from rev 8027, labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml 2006-12-01 16:49:56 UTC (rev 8027)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/jbossesb-properties.xml 2006-12-01 21:26:17 UTC (rev 8037)
@@ -0,0 +1,90 @@
+<?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.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="mail.osserver.net"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="kstam"/>
+ <property name="org.jboss.soa.esb.mail.smtp.from" value="kurt.stam at jboss.com"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ <!-- if your mail server requires this - most do now a days -->
+ <property name="org.jboss.soa.esb.mail.smtp.auth" value="false"/>
+
+ </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">
+ <property name="org.jboss.soa.esb.persistence.messagestore.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ <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"/>
+ <!-- # of milliseconds to timeout waiting for a connection from pool -->
+ <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>
+ <!-- this section added for the convenience of the trailblazer only -->
+ <properties name="trailblazer">
+ <property name="org.jboss.soa.esb.trailblazer.request.service.epr.name" value="creditagency"/>
+ <property name="org.jboss.soa.esb.trailblazer.request.service.category" value="trailblazer"/>
+ <property name="org.jboss.soa.esb.trailblazer.jmsbank.queue" value="queue/C"/>
+ <property name="org.jboss.soa.esb.trailblazer.email.template.path" value="template"/>
+ <property name="org.jboss.soa.esb.trailblazer.email.template.file" value="quote"/>
+ </properties>
+</esb>
Deleted: labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml 2006-12-01 21:06:18 UTC (rev 8036)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/trailblazer-properties.xml 2006-12-01 21:26:17 UTC (rev 8037)
@@ -1,90 +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.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="my.smtp.com"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="me at me.com"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value="mypasswd"/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="587"/>
- <property name="org.jboss.soa.esb.mail.smtp.from" value="me at me.com"/>
- <!-- if your mail server requires this - most do now a days -->
- <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/>
-
- </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">
- <property name="org.jboss.soa.esb.persistence.messagestore.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- <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"/>
- <!-- # of milliseconds to timeout waiting for a connection from pool -->
- <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>
- <!-- this section added for the convenience of the trailblazer only -->
- <properties name="trailblazer">
- <property name="org.jboss.soa.esb.trailblazer.request.service.epr.name" value="creditagency"/>
- <property name="org.jboss.soa.esb.trailblazer.request.service.category" value="trailblazer"/>
- <property name="org.jboss.soa.esb.trailblazer.jmsbank.queue" value="queue/C"/>
- <property name="org.jboss.soa.esb.trailblazer.email.template.path" value="template"/>
- <property name="org.jboss.soa.esb.trailblazer.email.template.file" value="quote"/>
- </properties>
-</esb>
More information about the jboss-svn-commits
mailing list