[jboss-svn-commits] JBL Code SVN: r16133 - in labs/jbossesb/workspace/dbevenius/redeliver: product and 34 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 29 03:12:30 EDT 2007
Author: beve
Date: 2007-10-29 03:12:29 -0400 (Mon, 29 Oct 2007)
New Revision: 16133
Added:
labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.xml
Removed:
labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.properties
Modified:
labs/jbossesb/workspace/dbevenius/redeliver/
labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/install/jboss-service.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListenerUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/readme.txt
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/test/SendEsbMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/MyAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/src/org/jboss/soa/esb/samples/quickstart/load_generator/JMSLoadAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/src/org/jboss/soa/esb/samples/quickstart/nativeclient/MyAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/war/src/org/jboss/soa/esb/samples/quickstart/nativeclient/webservice/HelloWorldWS.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/readme.txt
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyBasicAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyScheduledActionMsgComposer.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/test/SendEsbMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyRequestAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyResponseAction.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks-service.xml
Log:
Merge from main.
Property changes on: labs/jbossesb/workspace/dbevenius/redeliver
___________________________________________________________________
Name: svnmerge-integrated
- /labs/jbossesb/trunk:1-16081
+ /labs/jbossesb/trunk:1-16132
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -131,7 +131,7 @@
<copy todir="${build.dir}/jbossesb.sar">
<fileset dir="${installation.files.dir}/conf">
<include name="jbossesb-properties.xml"/>
- <include name="esb.juddi.properties"/>
+ <include name="esb.juddi.xml"/>
<include name="actionArtifactMap.properties"/>
</fileset>
<fileset dir="${installation.files.dir}/jUDDI-registry">
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.properties 2007-10-29 07:12:29 UTC (rev 16133)
@@ -1,71 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=true
-
-# jUDDI DataSource to use
-juddi.dataSource=java:/juddiDB
-
-# jUDDI database creation
-juddi.isCreateDatabase=true
-juddi.databaseExistsSql=select * from BUSINESS_ENTITY
-juddi.sqlFiles=juddi-sql/hsqldb/create_database.sql,juddi-sql/hsqldb/import.sql
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-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.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
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.xml (from rev 16120, labs/jbossesb/trunk/product/install/conf/esb.juddi.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/conf/esb.juddi.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+ <comment>
+ jUDDI Registry Properties (used by RegistryServer)
+ see http://www.juddi.org for more information
+
+ N.B. This file is an XML Property equivalent of the
+ standard jUDDI property file.
+ </comment>
+
+ <!-- The UDDI Operator Name -->
+ <entry key="juddi.operatorName">jUDDI.org</entry>
+
+ <!-- The i18n locale default codes -->
+ <entry key="juddi.i18n.languageCode">en</entry>
+ <entry key="juddi.i18n.countryCode">US</entry>
+
+ <!-- The UDDI DiscoveryURL Prefix -->
+ <entry key="juddi.discoveryURL">http://localhost:8080/juddi/uddiget.jsp?</entry>
+
+ <!-- The UDDI Operator Contact Email Address -->
+ <entry key="juddi.operatorEmailAddress">admin at juddi.org</entry>
+
+ <!--
+ The maximum name size and maximum number
+ of name elements allows in several of the
+ FindXxxx and SaveXxxx UDDI functions.
+ -->
+ <entry key="juddi.maxNameLength">255</entry>
+ <entry key="juddi.maxNameElementsAllowed">5</entry>
+
+ <!--
+ The maximum number of UDDI artifacts allowed
+ per publisher. A value of '-1' indicates any
+ number of artifacts is valid (These values can be
+ overridden at the individual publisher level).
+ -->
+ <entry key="juddi.maxBusinessesPerPublisher">25</entry>
+ <entry key="juddi.maxServicesPerBusiness">20</entry>
+ <entry key="juddi.maxBindingsPerService">10</entry>
+ <entry key="juddi.maxTModelsPerPublisher">100</entry>
+
+ <!-- jUDDI Authentication module to use -->
+ <entry key="juddi.auth">org.apache.juddi.auth.DefaultAuthenticator</entry>
+
+ <!-- jUDDI DataStore module currently to use -->
+ <entry key="juddi.dataStore">org.apache.juddi.datastore.jdbc.JDBCDataStore</entry>
+
+ <!--
+ use a dataSource (if set to false a direct
+ jdbc connection will be used.
+ -->
+ <entry key="juddi.isUseDataSource">true</entry>
+
+ <!-- jUDDI DataSource to use -->
+ <entry key="juddi.dataSource">java:/juddiDB</entry>
+
+ <!-- jUDDI database creation -->
+ <entry key="juddi.isCreateDatabase">true</entry>
+ <entry key="juddi.databaseExistsSql">select * from BUSINESS_ENTITY</entry>
+ <entry key="juddi.sqlFiles">juddi-sql/hsqldb/create_database.sql,juddi-sql/hsqldb/import.sql</entry>
+
+ <!-- jUDDI UUIDGen implementation to use -->
+ <entry key="juddi.uuidgen">org.apache.juddi.uuidgen.DefaultUUIDGen</entry>
+
+ <!-- jUDDI Cryptor implementation to use -->
+ <entry key="juddi.cryptor">org.apache.juddi.cryptor.DefaultCryptor</entry>
+
+ <!-- jUDDI Validator to use -->
+ <entry key="juddi.validator">org.apache.juddi.validator.DefaultValidator</entry>
+
+ <!-- jUDDI Proxy Properties (used by RegistryProxy) -->
+ <entry key="juddi.proxy.adminURL">http://localhost:8080/juddi/admin</entry>
+ <entry key="juddi.proxy.inquiryURL">http://localhost:8080/juddi/inquiry</entry>
+ <entry key="juddi.proxy.publishURL">http://localhost:8080/juddi/publish</entry>
+ <entry key="juddi.proxy.transportClass">org.apache.juddi.proxy.AxisTransport</entry>
+ <entry key="juddi.proxy.securityProvider">com.sun.net.ssl.internal.ssl.Provider</entry>
+ <entry key="juddi.proxy.protocolHandler">com.sun.net.ssl.internal.www.protocol</entry>
+
+ <!-- JNDI settings (used by RMITransport) -->
+ <entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
+ <entry key="java.naming.provider.url">jnp://localhost:1099</entry>
+ <entry key="java.naming.factory.url.pkgs">org.jboss.naming</entry>
+</properties>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/jboss-service.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/jboss-service.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
+ <mbean code="org.jboss.soa.esb.common.JBossESBPropertyService"
+ name="jboss.esb:service=PropertyService">
+ <attribute name="PropertyFile">${jboss.server.home.dir}/deploy/jbossesb.sar/jbossesb-properties.xml</attribute>
+ </mbean>
<mbean code="org.jboss.internal.soa.esb.services.registry.RegistryService"
name="jboss.esb:service=ESBRegistry">
+ <depends>jboss.esb:service=PropertyService</depends>
</mbean>
<mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService"
name="jboss.esb:service=JuddiRMI"
description="Juddi RMI Service">
+ <attribute name="PropertiesResourceFile">${jboss.server.home.dir}/deploy/jbossesb.sar/esb.juddi.xml</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+ <depends>jboss.esb:service=PropertyService</depends>
</mbean>
<mbean code="org.jboss.soa.esb.listeners.config.JBoss4ESBDeployer"
name="jboss.esb:service=ESBDeployer">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -23,8 +23,6 @@
package org.jboss.internal.soa.esb.dependencies;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.util.Properties;
@@ -33,7 +31,10 @@
import org.apache.juddi.registry.rmi.JNDIRegistration;
import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.util.PropertiesHelper;
import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
@@ -42,45 +43,56 @@
public static final String PROPNAME_JAVA_NAMING_PROVIDER_URL = "java.naming.provider.url";
public static final String PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS = "java.naming.factory.url.pkgs";
- private String propertiesResourcePath = "esb.juddi.properties";
+ private static final String DEFAULT_PROPERTIES_RESOURCE_FILE = "esb.juddi.xml";
+ private static final String JUDDI_PROPERTIES_RESOURCE_FILE = "esb.juddi.properties";
+ private static final String JUDDI_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
+
+ private String propertiesResourceFile ;
- public String getPropertiesResourcePath()
+ public String getPropertiesResourceFile()
{
- return propertiesResourcePath;
+ return propertiesResourceFile;
}
- public void setPropertiesResourcePath(String propertiesResourcePath)
+ public void setPropertiesResourceFile(String propertiesResourceFile)
{
- this.propertiesResourcePath = propertiesResourcePath;
+ this.propertiesResourceFile = propertiesResourceFile;
}
protected void startService() throws Exception
{
logger.info("starting juddi RMI service");
- URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourcePath);
- URI uri = new URI(url.toString());
- File confFile = new File(uri);
- System.setProperty("juddi.propertiesFile", confFile.toString());
+ final File xmlPropertyFile ;
+ if (propertiesResourceFile == null)
+ {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_PROPERTIES_RESOURCE_FILE);
+ URI uri = new URI(url.toString());
+ xmlPropertyFile = new File(uri) ;
+ }
+ else
+ {
+ xmlPropertyFile = new File(propertiesResourceFile) ;
+ }
+ final ServerConfig serverConfig = ServerConfigLocator.locate() ;
+ final File dataDir = serverConfig.getServerDataDir() ;
+ final File juddiPropertyFile = new File(dataDir, JUDDI_PROPERTIES_RESOURCE_FILE) ;
+
+ final Properties xmlProperties = PropertiesHelper.translateXMLToText(xmlPropertyFile, juddiPropertyFile, JUDDI_PROPERTY_FILE_COMMENTS) ;
+ System.setProperty("juddi.propertiesFile", juddiPropertyFile.getAbsolutePath());
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
// Read properties from file and if they exist - pass them on to juddi as system properties
- Properties properties = new Properties();
- try {
- properties.load(new FileInputStream(confFile));
- String factoryInitial = properties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, null);
- String providerURL = properties.getProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, null);
- String factoryURLPkgs = properties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, null);
- if (factoryInitial != null) {
- System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, factoryInitial);
- }
- if (providerURL != null) {
- System.setProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, providerURL);
- }
- if (factoryURLPkgs != null) {
- System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, factoryURLPkgs);
- }
- } catch (IOException e) {
- logger.error(e);
+ String factoryInitial = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, null);
+ String providerURL = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, null);
+ String factoryURLPkgs = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, null);
+ if (factoryInitial != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, factoryInitial);
+ }
+ if (providerURL != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, providerURL);
+ }
+ if (factoryURLPkgs != null) {
+ System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, factoryURLPkgs);
}
JNDIRegistration.register();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -27,9 +27,9 @@
public interface JuddiRMIServiceMBean extends ServiceMBean
{
- String getPropertiesResourcePath()
+ String getPropertiesResourceFile()
;
- void setPropertiesResourcePath(String propertiesResourcePath)
+ void setPropertiesResourceFile(String propertiesResourceFile)
;
}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java (from rev 16120, labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+package org.jboss.internal.soa.esb.util;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Utility functions for processing property files.
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class PropertiesHelper
+{
+ /**
+ * Translate a property file from an XML format to a text format.
+ * @param xmlPropertyFile The XML file
+ * @param propertyFile The property file
+ * @param propertyFileComments The property file comments
+ * @return The properties
+ * @throws IOException for errors during reading/writing.
+ */
+ public static Properties translateXMLToText(final File xmlPropertyFile,
+ final File propertyFile, final String propertyFileComments)
+ throws IOException
+ {
+ final FileInputStream fis = new FileInputStream(xmlPropertyFile) ;
+ try
+ {
+ final FileOutputStream fos = new FileOutputStream(propertyFile) ;
+ try
+ {
+ return translateXMLToText(fis, fos, propertyFileComments) ;
+ }
+ finally
+ {
+
+ fos.close() ;
+ }
+ }
+ finally
+ {
+ fis.close() ;
+ }
+ }
+
+ /**
+ * Translate a property file from an XML format to a text format.
+ * @param xmlPropertyInputStream The XML property input stream
+ * @param propertyOutputStream The property output stream
+ * @param propertyFileComments The property file comments
+ * @return The properties
+ * @throws IOException for errors during reading/writing.
+ */
+ public static Properties translateXMLToText(final FileInputStream xmlPropertyInputStream,
+ final FileOutputStream propertyOutputStream, final String propertyFileComments)
+ throws IOException
+ {
+ final Properties xmlProperties = new Properties() ;
+ final BufferedInputStream bis = new BufferedInputStream(xmlPropertyInputStream) ;
+
+ xmlProperties.loadFromXML(bis) ;
+
+ final BufferedOutputStream bos = new BufferedOutputStream(propertyOutputStream) ;
+ xmlProperties.store(bos, propertyFileComments) ;
+ bos.flush() ;
+
+ return xmlProperties ;
+ }
+}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java (from rev 16120, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.common;
+
+import java.io.File;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * This MBean wraps the configuration to allow ServiceBindingManager
+ * to alter the configuration.
+ */
+public class JBossESBPropertyService extends ServiceMBeanSupport implements JBossESBPropertyServiceMBean
+{
+ /**
+ * The current property file name.
+ */
+ private String propertyFile ;
+
+ /**
+ * Get the property file.
+ * @return The name of the property file being used.
+ */
+ public String getPropertyFile()
+ {
+ return propertyFile ;
+ }
+
+ /**
+ * Set the property file.
+ * @param propertyFile The name of the property file being used.
+ */
+ public void setPropertyFile(final String propertyFile)
+ {
+ this.propertyFile = propertyFile ;
+ }
+
+ /**
+ * Create the property service.
+ */
+ @Override
+ protected void createService()
+ throws Exception
+ {
+ if (propertyFile != null)
+ {
+ final File propertyFile = new File(this.propertyFile) ;
+ System.setProperty(Environment.PROPERTIES_FILE, "abs://" + propertyFile.getAbsolutePath());
+ }
+ }
+}
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java (from rev 16120, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.jboss.soa.esb.common;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * This MBean wraps the configuration to allow ServiceBindingManager
+ * to alter the configuration.
+ */
+public interface JBossESBPropertyServiceMBean extends ServiceMBean
+{
+ /**
+ * Get the property file.
+ * @return The name of the property file being used.
+ */
+ public String getPropertyFile() ;
+ /**
+ * Set the property file.
+ * @param propertyFile The name of the property file being used.
+ */
+ public void setPropertyFile(final String propertyFile) ;
+}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -48,7 +48,7 @@
m_oDS = p_oDS;
m_oLogger = Logger.getLogger(this.getClass());
}
-
+
public void commit() throws SQLException
{
if (null != m_conn)
@@ -65,6 +65,10 @@
}
}
+ public List<PreparedStatement> getStatements() {
+ return m_olPrepSt;
+ }
+
public void release()
{
if (null != m_conn)
@@ -123,7 +127,7 @@
public ResultSet execQueryWait(PreparedStatement p_PS, int p_iQtry)
throws SQLException
- {
+ {
if (null == m_conn)
{
connect();
@@ -141,18 +145,17 @@
{
if (null == eRet)
eRet = e;
-
- // TODO magic number!!
-
- try
- {
+
+ try {
Thread.sleep(100 + (new Double(100 * Math.random()))
.longValue());
- }
- catch (InterruptedException ex)
- {
+ } catch (InterruptedException ex) {
m_oLogger.debug("Thread interrupted.", ex);
}
+
+ release();
+ m_conn = null;
+
}
}
m_oLogger.debug("execQueryWait() FAILED", eRet);
@@ -189,6 +192,10 @@
{
m_oLogger.debug("Thread interrupted.", ex);
}
+
+ release();
+ m_conn = null;
+
}
}
m_oLogger.debug("execUpdWait() FAILED", eRet);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -24,6 +24,7 @@
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.SQLException;
import javax.sql.DataSource;
@@ -53,7 +54,7 @@
private String m_sUrl, m_sUsr, m_sPwd;
private Connection m_oConn;
-
+
public static final String DRIVER = "driver-class";
public static final String URL = "connection-url";
@@ -124,8 +125,16 @@
}
} // ________________________________
- public Connection getConnection ()
+ public Connection getConnection() throws SQLException
{
+ if ((m_oConn == null) || (m_oConn.isClosed())) {
+ m_oConn = getConnection(m_sUsr, m_sPwd);
+ }
+
+ if (m_oConn == null) {
+ throw new SQLException();
+ }
+
return m_oConn;
}
@@ -139,7 +148,9 @@
}
catch (Exception e)
{
- _logger.error("Can't obtain datasource", e);
+ _logger.error("Could not create connection for " + m_sUrl + " - datasource may be unavailable. "
+ + "See server log for details.");
+ _logger.debug("Can't obtain datasource", e);
m_oConn = null;
}
return m_oConn;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -127,13 +127,9 @@
boolean failure = true;
try {
- prepareStatements();
+ _dbConn = getDbConn();
failure = false;
}
- catch (final SQLException sqle) {
- throw new ManagedLifecycleException(
- "Unexpected error initialising statements", sqle);
- }
finally {
if (failure) {
if (_dbConn != null) {
@@ -397,9 +393,9 @@
} // ________________________________
protected void prepareStatements() throws SQLException {
- _PSscan = getDbConn().prepareStatement(scanStatement());
- _PSupdate = getDbConn().prepareStatement(updateStatement());
- _PSdeleteRow = getDbConn().prepareStatement(deleteStatement());
+ _PSscan = _dbConn.prepareStatement(scanStatement());
+ _PSupdate = _dbConn.prepareStatement(updateStatement());
+ _PSdeleteRow = _dbConn.prepareStatement(deleteStatement());
} // ________________________________
/*
@@ -510,7 +506,16 @@
DataSource oDS = new SimpleDataSource(_driver, _url, _user,
_password);
_dbConn = new JdbcCleanConn(oDS);
+ }
+
+ if ((null != _dbConn) && (_dbConn.getStatements().size() == 0)) {
+ try {
+ prepareStatements();
+ } catch (SQLException e) {
+ _logger.debug("Exception preparing statements", e);
+ }
}
+
return _dbConn;
} // ________________________________
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java (from rev 16120, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,161 @@
+/*
+ * 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.
+ */
+
+package org.jboss.soa.esb.actions;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.couriers.MockCourier;
+import org.jboss.internal.soa.esb.couriers.MockCourierFactory;
+import org.jboss.internal.soa.esb.services.registry.MockRegistry;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.testutils.FileUtil;
+import org.jboss.soa.esb.util.ClassUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test the Aggregator class
+ *
+ * @author <a href="mailto:kurt.stam at jboss.com">Kurt Stam</a>
+ */
+
+
+public class AggregatorUnitTest
+{
+ static Logger logger = Logger.getLogger(AggregatorUnitTest.class);
+ static Message message = null;
+
+ private static EPR epr1;
+ private static EPR epr2;
+ private static EPR epr3;
+ private static MockCourier courier1;
+ private static MockCourier courier2;
+ private static MockCourier courier3;
+
+ private static ConfigTree[] actions;
+
+ public static junit.framework.Test suite()
+ {
+ return new JUnit4TestAdapter(AggregatorUnitTest.class);
+ }
+
+
+ @BeforeClass
+ public static void before() throws Exception {
+ MockCourierFactory.install();
+ MockRegistry.install();
+
+ epr1 = new EPR(new URI("test1"));
+ epr2 = new EPR(new URI("test2"));
+ epr3 = new EPR(new URI("DLS"));
+ courier1 = new MockCourier(true);
+ courier2 = new MockCourier(true);
+ courier3 = new MockCourier(true);
+
+ MockRegistry.register("test", "java", epr1, courier1);
+ MockRegistry.register("test", "xml", epr2, courier2);
+ MockRegistry.register("test", "aggregator", epr3, courier3);
+
+ message = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ message.getBody().add(("Hello Aggregator"));
+
+ InputStream in = ClassUtil.getResourceAsStream("AggregatorUnitTest.xml", AggregatorUnitTest.class);
+ String xml = FileUtil.readStream(in);
+ actions = ConfigTree.fromXml(xml).getChildren("action");
+ }
+
+ @Test
+ public void aggregateThreeMessages()
+ {
+ try {
+ Aggregator aggregator = new Aggregator(actions[0]);
+ int recipientCount=3;
+ String uuId = UUID.randomUUID().toString();
+ long timestamp = System.currentTimeMillis();
+ ArrayList<String> aggregatorTags = new ArrayList<String>();
+
+ for(int i = 0; i < recipientCount; i++)
+ {
+ String tag = uuId + ":" + (i + 1) + ":" + recipientCount + ":" + timestamp;
+ aggregatorTags.add(tag);
+ message.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
+ Message responseMessage = aggregator.process(message);
+ if (i<recipientCount-1) {
+ assertNull(responseMessage);
+ } else {
+ assertNotNull(responseMessage);
+ }
+ }
+
+ } catch (Exception e) {
+ assertTrue(false);
+ }
+ }
+
+ @Test
+ public void aggregateTimeoutTest1()
+ {
+ try {
+ Aggregator aggregator = new Aggregator(actions[1]);
+ int recipientCount=3;
+ String uuId = UUID.randomUUID().toString();
+ long timestamp = System.currentTimeMillis();
+ ArrayList<String> aggregatorTags = new ArrayList<String>();
+
+ for(int i = 0; i < recipientCount; i++)
+ {
+ String tag = uuId + ":" + (i + 1) + ":" + recipientCount + ":" + timestamp;
+ aggregatorTags.add(tag);
+ message.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
+
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {}
+
+ Message responseMessage = aggregator.process(message);
+
+ //all message should be expired
+ assertNull(responseMessage);
+
+ }
+
+ } catch (Exception e) {
+ assertTrue(false);
+ }
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.xml (from rev 16120, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,6 @@
+<testActions>
+ <action class="org.jboss.soa.esb.actions.Aggregator" name="Aggregator" timeoutInMillies="60000"
+ service-category="test" service-name="Aggregator" />
+ <action class="org.jboss.soa.esb.actions.Aggregator" name="Aggregator" timeoutInMillies="100"
+ service-category="test" service-name="Aggregator"/>
+</testActions>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -229,7 +229,7 @@
@Test
public void construct_with_priority_attribute() throws ConfigurationException, NamingException, JMSException
{
- final int expectedPriority = 10;
+ final int expectedPriority = 9;
ConfigTree config = createConfigTree();
config.setAttribute( JMSRouter.PRIORITY_ATTR, String.valueOf( expectedPriority ) );
JMSRouter router = new JMSRouter( config );
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListenerUnitTest.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListenerUnitTest.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.helpers.persist.JdbcCleanConn;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
@@ -104,19 +105,7 @@
}
boolean exception = false;
-
- try
- {
- gateway.prepareStatements();
- }
- catch (RuntimeException ex)
- {
- exception = true;
- }
-
- if (!exception)
- fail();
-
+
tree = new ConfigTree("test");
tree.setAttribute(JDBCEpr.URL_TAG, getDbUrl());
@@ -155,6 +144,7 @@
try
{
+ JdbcCleanConn conn = gateway.getDbConn();
gateway.prepareStatements();
}
catch (RuntimeException ex)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/readme.txt 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/readme.txt 2007-10-29 07:12:29 UTC (rev 16133)
@@ -26,10 +26,10 @@
'ant deployProcess'.
3. Switch back to Application Server console and wait for the message
'Process Definition Deployed:' to appear on the console.
- 3. Switch back to Application Server console to see the output from the ESB
- 4. In this folder ("Window1"), type 'ant undeploy'.
- 5. Switch back to Application Server console to see the output from the ESB.
- 6. To undeploy the esb archive, type 'ant undeploy' ("Window1").
+ 4. In the command terminal window ("Window2"), type
+ 'ant startProcess'
+ 5. Switch back to Application Server console to see the output from the ESB
+ 6. In this folder ("Window1"), type 'ant undeploy'.
Extra Credit:
=============
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/test/SendEsbMessage.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/test/SendEsbMessage.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -58,7 +58,7 @@
esbMessage.getHeader().setCall(call);
// set body contents with args[2], and send
- esbMessage.getBody().setByteArray((args[2] + " - " + new Date()).getBytes());
+ esbMessage.getBody().add(args[2] + " - " + new Date());
new ServiceInvoker(args[0], args[1]).deliverAsync(esbMessage);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/MyJMSListenerAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -35,7 +35,7 @@
public Message displayMessage(Message message) throws Exception{
logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get());
logFooter();
return message;
}
@@ -45,7 +45,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/fun_cbr/src/org/jboss/soa/esb/samples/quickstart/funcbr/ReturnJMSMessage.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -51,7 +51,7 @@
conn.start();
- String newMsg = new String(esbMessage.getBody().getByteArray());
+ String newMsg = (String) esbMessage.getBody().get();
QueueSender send = session.createSender(que);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_ftp_action/src/org/jboss/soa/esb/samples/quickstart/helloworldftpaction/MyAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -36,7 +36,7 @@
public Message displayMessage(Message message) throws Exception{
logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get());
logFooter();
return message;
}
@@ -46,12 +46,12 @@
Body msgBody = message.getBody();
// Call theCall = msgHeader.getCall();
// EPR theEpr = theCall.getFrom();
- String contents = new String(msgBody.getByteArray());
+ String contents = (String) msgBody.get();
StringBuffer sb = new StringBuffer();
sb.append("\nBEFORE\n");
sb.append(contents);
sb.append("\nAFTER\n");
- msgBody.setByteArray(sb.toString().getBytes());
+ msgBody.add(sb.toString());
return message;
}
@@ -60,7 +60,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/MyAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/MyAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/helloworld_sql_action/src/org/jboss/soa/esb/samples/quickstart/helloworldsqlaction/MyAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -26,6 +26,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.BytesBody;
public class MyAction extends AbstractActionLifecycle
{
@@ -39,8 +40,7 @@
@SuppressWarnings("unchecked")
public Message displayMessage(Message message) throws Exception{
logHeader();
- Map<String,Object> rowData =(Map)message.getProperties()
- .getProperty(ListenerTagNames.SQL_ROW_DATA_TAG);
+ Map<String,Object> rowData =(Map)message.getBody().get("org.jboss.soa.esb.message.defaultEntry");
StringBuffer results = new StringBuffer();
for (Map.Entry<String,Object> curr : rowData.entrySet()) {
results.append("column "+curr.getKey()+" = <" + curr.getValue()+">");
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -9,11 +9,9 @@
<import file="../conf/base-build.xml" />
<property file="../conf/quickstarts.properties" />
- <property environment="env" />
-
<path id="groovy.classpath">
- <fileset dir="${env.GROOVY_HOME}/embeddable/" includes="*.jar" />
- <fileset dir="${env.GROOVY_HOME}/lib/" includes="commons-*.jar" />
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="groovy*.jar" />
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
</path>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/src/org/jboss/soa/esb/samples/quickstart/load_generator/JMSLoadAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/src/org/jboss/soa/esb/samples/quickstart/load_generator/JMSLoadAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/src/org/jboss/soa/esb/samples/quickstart/load_generator/JMSLoadAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -37,7 +37,7 @@
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
System.out.println("Body: "
- + new String(message.getBody().getByteArray()));
+ + message.getBody().get());
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
Thread.sleep(10);
return message;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/src/org/jboss/soa/esb/samples/quickstart/nativeclient/MyAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/src/org/jboss/soa/esb/samples/quickstart/nativeclient/MyAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/src/org/jboss/soa/esb/samples/quickstart/nativeclient/MyAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -39,17 +39,17 @@
public Message displayMessage(Message message) throws Exception {
logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get());
logFooter();
return message;
}
public Message playWithMessage(Message message) throws Exception {
Body msgBody = message.getBody();
- String contents = new String(msgBody.getByteArray());
+ String contents = (String) msgBody.get();
// Reset the message body contents with the response...
- msgBody.setByteArray(("Hello From ESB MyAction: " + contents).getBytes());
+ msgBody.add(("Hello From ESB MyAction: " + contents));
return message;
}
@@ -59,7 +59,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/war/src/org/jboss/soa/esb/samples/quickstart/nativeclient/webservice/HelloWorldWS.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/war/src/org/jboss/soa/esb/samples/quickstart/nativeclient/webservice/HelloWorldWS.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/native_client/war/src/org/jboss/soa/esb/samples/quickstart/nativeclient/webservice/HelloWorldWS.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -48,12 +48,12 @@
deliveryAdapter = new org.jboss.soa.esb.client.ServiceInvoker("MyServiceCategory", "MyNativeClientService");
// Create and populate the request message...
requestMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- requestMessage.getBody().setByteArray(toWhom.getBytes()); // inject the value from the WS client
+ requestMessage.getBody().add(toWhom); // inject the value from the WS client
// Deliver the request message synchronously - timeout after 20 seconds...
replyMessage = deliveryAdapter.deliverSync(requestMessage, 20000);
if (replyMessage != null) {
- results = new String(replyMessage.getBody().getContents());
+ results = (String) replyMessage.getBody().get();
} else {
results = "Hello World: " + toWhom + " on " + new java.util.Date();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/readme.txt 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/readme.txt 2007-10-29 07:12:29 UTC (rev 16133)
@@ -48,7 +48,7 @@
invocations into a particular sequence for a listener and how to respond
(request/reply). This example uses the notification feature.
-* more_action - demonstrates numerous tips & tricks to using the JBoss ESB
+* custom_action - demonstrates numerous tips & tricks to using the JBoss ESB
actions. The first option shows what happens if you don't specify a "process"
attribute. The second option illustrates how to make multiple method calls of
a since action class instance. The third option shows you how to create your
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyBasicAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyBasicAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyBasicAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -40,9 +40,9 @@
return message;
}
-
+ /*
public Message displayMessage(Message message) throws ActionProcessingException {
- String content = new String(message.getBody().getByteArray());
+ String content = (String) message.getBody().get();
HashMap myMap = (HashMap) message.getBody().get("MyStuff");
Object x = message.getBody().get();
logHeader();
@@ -55,14 +55,14 @@
message.getBody().setByteArray(new String(content + " " + new java.util.Date()).getBytes());
return message;
}
-
+ */
public Message displayMessage2(Message message) throws ActionProcessingException {
- String content = new String(message.getBody().getByteArray());
+ String content = (String) message.getBody().get();
logHeader();
System.out.println("Body: " + content);
logFooter();
- message.getBody().setByteArray(new String(content + " " + new java.util.Date()).getBytes());
- return message;
+ message.getBody().add(content + " " + new java.util.Date());
+ return message;
}
public Message causesException(Message message) throws ActionProcessingException {
@@ -74,7 +74,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyScheduledActionMsgComposer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyScheduledActionMsgComposer.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/MyScheduledActionMsgComposer.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -40,7 +40,7 @@
public Message composeMessage() throws SchedulingException {
System.out.println("compose a message");
Message myMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- myMessage.getBody().add("Hello Scheduled World".getBytes());
+ myMessage.getBody().add("Hello Scheduled World");
return myMessage;
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/test/SendEsbMessage.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/scheduled_services/src/org/jboss/soa/esb/samples/quickstart/scheduler/test/SendEsbMessage.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -60,7 +60,7 @@
ServiceInvoker invoker = new ServiceInvoker(category,serviceName);
Message requestMessage;
requestMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- requestMessage.getBody().setByteArray(msgText.getBytes());
+ requestMessage.getBody().add(msgText);
try {
invoker.deliverAsync(requestMessage); // no waiting for a response
} catch (Exception e) {
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/MyJMSListenerAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -35,7 +35,7 @@
public Message displayMessage(Message message) throws Exception{
logHeader();
- System.out.println("Body: " + new String(message.getBody().getByteArray()));
+ System.out.println("Body: " + message.getBody().get());
logFooter();
return message;
}
@@ -45,7 +45,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/ReturnJMSMessage.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -55,7 +55,7 @@
conn.start();
- String newMsg = new String(esbMessage.getBody().getByteArray());
+ String newMsg = (String) esbMessage.getBody().get();
QueueSender send = session.createSender(que);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -36,7 +36,7 @@
public Message sendResponse(Message message) {
try {
logHeader();
- System.out.println(new String(message.getBody().getByteArray()));
+ System.out.println(message.getBody().get());
System.out.println("EXPRESS EXPRESS EXPRESS");
logFooter();
ReturnJMSMessage.sendMessage(message,"CBRExpressFreeShippingAlert");
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -36,7 +36,7 @@
public Message sendResponse(Message message) {
try {
logHeader();
- System.out.println(new String(message.getBody().getByteArray()));
+ System.out.println(message.getBody().get());
System.out.println("NORMAL SHIPPING");
logFooter();
ReturnJMSMessage.sendMessage(message,"CBRNormalShippingAlert");
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_aop/src/org/jboss/soa/esb/samples/quickstart/spring_aop/MySpringEnabledAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -49,7 +49,7 @@
logHeader();
// interceptor will get applied here
// check the console output to see the interceptor changed the message
- hello.setGreeting(new String(message.getBody().getByteArray()));
+ hello.setGreeting((String)message.getBody().get());
logFooter();
return message;
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/build.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/build.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -33,6 +33,9 @@
<exec os="Windows" executable="cmd.exe" dir="./hsqldb">
<arg value="server.bat" />
</exec>
+ <exec os="Mac OS X" executable="/bin/sh" dir="./hsqldb">
+ <arg value="server.sh" />
+ </exec>
</target>
</project>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/spring_jpetstore/src/org/jboss/soa/esb/samples/quickstart/spring_jpetstore/InsertOrderAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -54,7 +54,7 @@
Body msgBody = message.getBody();
XStream xstream = new XStream(new DomDriver());
xstream.alias("order", Order.class);
- Order order = (Order) xstream.fromXML(new String(msgBody.getByteArray()));
+ Order order = (Order) xstream.fromXML((String) msgBody.get());
PetStoreFacade petStore = (PetStoreFacade) getBeanFactory()
.getBean("petStore");
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/static_router/src/org/jboss/soa/esb/samples/quickstart/staticrouter/SimpleFileAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -33,9 +33,9 @@
public Message process(Message message) throws Exception
{
- String sMsg = new String(message.getBody().getByteArray());
+ String sMsg = (String) message.getBody().get();
sMsg = sMsg + " - to file with suffix="+_config.getAttribute("msgSuffix");
- message.getBody().setByteArray(sMsg.getBytes());
+ message.getBody().add(sMsg);
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
System.out.println("\nBody: " + sMsg);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/transform_XML2POJO/src/org/jboss/soa/esb/samples/quickstart/transformxml2pojo/ReturnJMSMessage.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -74,7 +74,7 @@
conn.start();
- String newMsg = new String(esbMessage.getBody().getByteArray());
+ String newMsg = (String) esbMessage.getBody().get();
QueueSender send = session.createSender(que);
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -31,8 +31,6 @@
<property name="wsdl"
value="http://127.0.0.1:8080/Quickstart_webservice_consumer1/HelloWorldWS?wsdl" />
<property name="operation" value="sayHello" />
- <property name="paramsLocation" value="helloworld-request-parameters" />
- <property name="responseLocation" value="helloworld-response" />
<property name="responseAsOgnlMap" value="true" />
<property name="SOAPAction" value="sayHello"/>
</action>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyRequestAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyRequestAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyRequestAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -55,7 +55,7 @@
// The "paramsLocation" property was set in jboss-esb.xml to
// "helloworld-request-parameters"
- message.getBody().add("helloworld-request-parameters", requestMap);
+ message.getBody().add(requestMap);
System.out.println("Request map is: " + requestMap.toString());
logFooter();
@@ -68,7 +68,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer1/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/MyResponseAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -65,7 +65,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -31,8 +31,6 @@
class="org.jboss.soa.esb.actions.soap.SOAPClient">
<property name="wsdl"
value="http://127.0.0.1:8080/Quickstart_webservice_consumer2/OrderProcessorWS?wsdl" />
- <property name="paramsLocation" value="request-params" />
- <property name="responseLocation" value="order-status-response" />
<property name="responseAsOgnlMap" value="true" />
<property name="SOAPAction" value="processOrder"/>
</action>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyRequestAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -74,7 +74,7 @@
requestMap.put("processOrder", requestObject);
//requestMap.put("order", order);
- message.getBody().add("request-params", requestMap);
+ message.getBody().add(requestMap);
System.out.println("Request map is: " + requestMap.toString());
logFooter();
@@ -103,7 +103,7 @@
requestMap.put("processOrder.order.lineItems[1].price", "30.00");
// The "paramsLocation" property was set in jboss-esb.xml to
- message.getBody().add("request-params", requestMap);
+ message.getBody().add(requestMap);
System.out.println("Request map is: " + requestMap.toString());
logFooter();
@@ -117,7 +117,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyResponseAction.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyResponseAction.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/webservice_consumer2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer2/MyResponseAction.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -51,8 +51,7 @@
// The "responseLocation" property was set in jboss-esb.xml to
// "helloworld-response"
- Map responseMsg = (Map) message.getBody()
- .get("order-status-response");
+ Map responseMsg = (Map) message.getBody().get();
System.out.println("Response Map is: " + responseMsg);
logFooter();
@@ -65,7 +64,7 @@
System.out.println("!ERROR!");
System.out.println(exception.getMessage());
System.out.println("For Message: ");
- System.out.println(message.getBody().getByteArray());
+ System.out.println(message.getBody().get());
logFooter();
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksConfiguration.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -23,6 +23,8 @@
import org.jboss.soa.esb.util.ClassUtil;
import java.util.Properties;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
@@ -35,12 +37,35 @@
private static final Logger logger = Logger.getLogger(SmooksConfiguration.class);
public static final String SMOOKS_ESB_PROPERTIES = "/smooks.esb.properties";
+
+ private static volatile String defaultConfiguration ;
SmooksConfiguration() {
InputStream configStream = ClassUtil.getResourceAsStream(SMOOKS_ESB_PROPERTIES, SmooksConfiguration.class);
if(configStream == null) {
- logger.warn("Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "' not found on classpath.");
+ final String defaultConfiguration = SmooksConfiguration.defaultConfiguration ;
+ if (defaultConfiguration != null) {
+ try {
+ final FileInputStream fis = new FileInputStream(defaultConfiguration) ;
+ try {
+ load(fis) ;
+ } catch (IOException e) {
+ logger.warn("Error loading Smooks.esb default configuration file '" + defaultConfiguration + "'.", e);
+ }
+ finally {
+ try {
+ fis.close() ;
+ } catch (IOException e) {
+ logger.warn("Error closing stream for Smooks.esb default configuration file '" + defaultConfiguration + "'.", e);
+ }
+ }
+ } catch (final FileNotFoundException fnfe) {
+ logger.warn("Smooks.esb default configuration file '" + defaultConfiguration + "' not found.");
+ }
+ } else {
+ logger.warn("Smooks.esb configuration file '" + SMOOKS_ESB_PROPERTIES + "' not found on classpath.");
+ }
} else {
try {
load(configStream);
@@ -55,4 +80,22 @@
}
}
}
+
+ /**
+ * Set the default configuration file.
+ * @param defaultConfiguration The default configuration file.
+ */
+ public static void setDefaultConfiguration(final String defaultConfiguration)
+ {
+ SmooksConfiguration.defaultConfiguration = defaultConfiguration ;
+ }
+
+ /**
+ * Get the default configuration file.
+ * @return the default configuration file.
+ */
+ public static String getDefaultConfiguration()
+ {
+ return defaultConfiguration ;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -19,9 +19,13 @@
*/
package org.jboss.soa.esb.actions.converters;
+import org.jboss.internal.soa.esb.util.PropertiesHelper;
import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
import org.apache.log4j.Logger;
+import java.io.File;
import java.util.Properties;
/**
@@ -37,8 +41,26 @@
private static SmooksInstanceManager globalSmooksInstanceManager;
private static final String CONSOLE_URL = "console.url";
+ private static final String SMOOKS_PROPERTY_FILE = "smooks.esb.properties";
+ private static final String SMOOKS_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
+
+ /**
+ * The smooks default property file.
+ */
+ private String propertyFile ;
+
protected void startService() throws Exception {
super.startService();
+
+ if (propertyFile != null) {
+ final File xmlPropertyFile = new File(propertyFile) ;
+ final ServerConfig serverConfig = ServerConfigLocator.locate() ;
+ final File dataDir = serverConfig.getServerDataDir() ;
+ final File smooksPropertyFile = new File(dataDir, SMOOKS_PROPERTY_FILE) ;
+
+ PropertiesHelper.translateXMLToText(xmlPropertyFile, smooksPropertyFile, SMOOKS_PROPERTY_FILE_COMMENTS) ;
+ SmooksConfiguration.setDefaultConfiguration(smooksPropertyFile.getAbsolutePath()) ;
+ }
Properties smooksEsbConfig = new SmooksConfiguration();
String resourceConfig = smooksEsbConfig.getProperty(CONSOLE_URL);
@@ -63,4 +85,20 @@
public static SmooksInstanceManager getGlobalSmooksInstanceManager() {
return globalSmooksInstanceManager;
}
+
+ /**
+ * Get the property file.
+ * @return The name of the property file being used.
+ */
+ public String getPropertyFile() {
+ return propertyFile ;
+ }
+
+ /**
+ * Set the property file.
+ * @param propertyFile The name of the property file being used.
+ */
+ public void setPropertyFile(final String propertyFile) {
+ this.propertyFile = propertyFile ;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java 2007-10-29 07:12:29 UTC (rev 16133)
@@ -29,4 +29,14 @@
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
public interface SmooksServiceMBean extends ServiceMBean {
+ /**
+ * Get the property file.
+ * @return The name of the property file being used.
+ */
+ public String getPropertyFile() ;
+ /**
+ * Set the property file.
+ * @param propertyFile The name of the property file being used.
+ */
+ public void setPropertyFile(final String propertyFile) ;
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks-service.xml 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks-service.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -2,6 +2,8 @@
<service>
<mbean code="org.jboss.soa.esb.actions.converters.SmooksService"
name="jboss.esb:service=SmooksService">
+ <attribute name="PropertyFile">${jboss.server.home.dir}/deploy/smooks.esb/smooks.esb.xml</attribute>
+
<depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
</mbean>
</service>
Deleted: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.properties
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.properties 2007-10-29 07:05:31 UTC (rev 16132)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.properties 2007-10-29 07:12:29 UTC (rev 16133)
@@ -1,35 +0,0 @@
-####################################################################################
-# Configure in the following property to enable config loading
-# from the Transformation Admin Console.
-####################################################################################
-#console.url=http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
-
-####################################################################################
-#
-# Base configurations. Added for all non-console based Smooks instances.
-# Value is comma-separated-list. All resources must be in the "smooks-base-configs"
-# folder of this .esb.
-#
-####################################################################################
-smooks.base.configs=creators.xml
-
-####################################################################################
-#
-# Context properties.
-#
-# Defaults to JBoss AS on localhost.
-#
-####################################################################################
-java.naming.provider.url=localhost
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=
-
-####################################################################################
-#
-# JMS properties.
-#
-# Provider defaults to JBoss MQ.
-#
-####################################################################################
-javax.jms.ConnectionFactory=ConnectionFactory
-update.notification.topic=topic/org.jboss.soa.esb.transformation.Update
\ No newline at end of file
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.xml (from rev 16120, labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/services/smooks/src/main/resources/smooks.esb.xml 2007-10-29 07:12:29 UTC (rev 16133)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+ <!--
+ Configure in the following property to enable config loading
+ from the Transformation Admin Console.
+ -->
+ <!--
+ <entry key="console.url">http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp</entry>
+ -->
+
+ <!--
+ Base configurations. Added for all non-console based Smooks instances.
+ Value is comma-separated-list. All resources must be in the
+ "smooks-base-configs" folder of this .esb.
+ -->
+ <entry key="smooks.base.configs">creators.xml</entry>
+
+ <!--
+ Context properties.
+
+ Defaults to JBoss AS on localhost.
+ -->
+ <entry key="java.naming.provider.url">localhost</entry>
+ <entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
+ <!--
+ <entry key="java.naming.factory.url.pkgs"></entry>
+ -->
+
+ <!--
+ JMS properties.
+
+ Provider defaults to JBoss MQ.
+ -->
+ <entry key="javax.jms.ConnectionFactory">ConnectionFactory</entry>
+ <entry key="update.notification.topic">topic/org.jboss.soa.esb.transformation.Update</entry>
+</properties>
More information about the jboss-svn-commits
mailing list