[jboss-svn-commits] JBL Code SVN: r16145 - in labs/jbossesb/trunk/product: install/conf and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 29 16:45:36 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-10-29 16:45:36 -0400 (Mon, 29 Oct 2007)
New Revision: 16145
Modified:
labs/jbossesb/trunk/product/install/bindings.xslt
labs/jbossesb/trunk/product/install/conf/esb.juddi.xml
labs/jbossesb/trunk/product/install/jboss-service.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml
labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml
labs/jbossesb/trunk/product/tools/console/management-esb/jboss-esb.xml
Log:
Update ServiceBinding config, workaround XSLTFileDelegate issues: JBESB-871
Modified: labs/jbossesb/trunk/product/install/bindings.xslt
===================================================================
--- labs/jbossesb/trunk/product/install/bindings.xslt 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/install/bindings.xslt 2007-10-29 20:45:36 UTC (rev 16145)
@@ -4,48 +4,54 @@
<xsl:template match="server[@name='ports-default']">
<xsl:call-template name="process-server">
<xsl:with-param name="serverName" select="@name"/>
- <xsl:with-param name="messageStorePort" select="9001"/>
+ <xsl:with-param name="jndiPort" select="1099"/>
+ <xsl:with-param name="webPort" select="8080"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="server[@name='ports-01']">
<xsl:call-template name="process-server">
<xsl:with-param name="serverName" select="@name"/>
- <xsl:with-param name="messageStorePort" select="9101"/>
+ <xsl:with-param name="jndiPort" select="1199"/>
+ <xsl:with-param name="webPort" select="8180"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="server[@name='ports-02']">
<xsl:call-template name="process-server">
<xsl:with-param name="serverName" select="@name"/>
- <xsl:with-param name="messageStorePort" select="9201"/>
+ <xsl:with-param name="jndiPort" select="1299"/>
+ <xsl:with-param name="webPort" select="8280"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="server[@name='ports-03']">
<xsl:call-template name="process-server">
<xsl:with-param name="serverName" select="@name"/>
- <xsl:with-param name="messageStorePort" select="9301"/>
+ <xsl:with-param name="jndiPort" select="1399"/>
+ <xsl:with-param name="webPort" select="8380"/>
</xsl:call-template>
</xsl:template>
<xsl:template name="process-server">
<xsl:param name="serverName"/>
- <xsl:param name="messageStorePort"/>
+ <xsl:param name="jndiPort"/>
+ <xsl:param name="webPort"/>
<xsl:copy xml:space="preserve"><xsl:apply-templates select="@*|node()"/>
- <xsl:comment> ************ ESB configuration for server <xsl:value-of select="$serverName"/> ************ </xsl:comment>
+ <xsl:comment> ************ ESB configuration for server <xsl:value-of select="$serverName"/> ************ </xsl:comment><xsl:text>
- <!-- Message Store Hypersonic database when using the tcp/ip access -->
- <service-config name="jboss.jca:service=ManagedConnectionFactory,name=JBossESBDS"
- delegateClass="org.jboss.services.binding.XSLTConfigDelegate"
- >
- <delegate-config>
- <xslt-config configName="ManagedConnectionFactoryProperties"><![CDATA[
+ </xsl:text>
+ <xsl:comment> Mapping for jbossesb-properties.xml </xsl:comment><xsl:text>
+</xsl:text>
+ <service-config name="jboss.esb:service=PropertyService"
+ delegateClass="org.jboss.services.binding.XSLTFileDelegate">
+ <delegate-config>
+ <xslt-config configName="PropertyFile"><![CDATA[
<xsl:stylesheet
xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
- <xsl:output method="xml" />
+ <xsl:output method="xml"/>
<xsl:param name="host"/>
<xsl:param name="port"/>
@@ -53,8 +59,11 @@
<xsl:apply-templates/>
</xsl:template>
- <xsl:template match="config-property[@name='ConnectionURL']">
- <config-property type="java.lang.String" name="ConnectionURL">jdbc:hsqldb:hsql://<xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></config-property>
+ <xsl:template match="property[@name='org.jboss.soa.esb.jndi.server.url']">
+ <xsl:element name="property">
+ <xsl:attribute name="name">org.jboss.soa.esb.jndi.server.url</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></xsl:attribute>
+ </xsl:element>
</xsl:template>
<xsl:template match="*|@*">
@@ -63,19 +72,101 @@
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
+ ]]>
+ </xslt-config>
+ <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ </delegate-config>
+ </service-config><xsl:text>
+</xsl:text>
+
+ <xsl:comment> Mapping for esb.juddi.xml </xsl:comment><xsl:text>
+</xsl:text>
+ <service-config name="jboss.esb:service=JuddiRMI"
+ delegateClass="org.jboss.services.binding.XSLTFileDelegate">
+ <delegate-config>
+ <xslt-config configName="PropertiesResourceFile"><![CDATA[
+<xsl:stylesheet
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+ <xsl:output method="xml"/>
+ <xsl:param name="host"/>
+ <xsl:param name="port"/>
+ <xsl:param name="webPort"/>
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='java.naming.provider.url']">
+ <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></entry>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='juddi.discoveryURL']">
+ <entry key="juddi.discoveryURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/uddiget.jsp?</entry>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='juddi.proxy.adminURL']">
+ <entry key="juddi.proxy.adminURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/admin</entry>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='juddi.proxy.inquiryURL']">
+ <entry key="juddi.proxy.inquiryURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/inquiry</entry>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='juddi.proxy.publishURL']">
+ <entry key="juddi.proxy.publishURL">http://<xsl:value-of select="$host"/>:<xsl:value-of select="$webPort"/>/juddi/publish</entry>
+ </xsl:template>
+
+ <xsl:template match="*|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
]]>
- </xslt-config>
- </delegate-config>
- <binding host="${{jboss.bind.address}}" port="{$messageStorePort}" />
- </service-config>
+ </xslt-config>
+ <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ <xslt-param name="webPort"><xsl:value-of select="$webPort"/></xslt-param>
+ </delegate-config>
+ </service-config><xsl:text>
+</xsl:text>
- <service-config name="jboss:service=Hypersonic,database=jbossesb"
- delegateClass="org.jboss.services.binding.AttributeMappingDelegate"
- >
- <delegate-config portName="Port" hostName="BindAddress"/>
- <binding host="${{jboss.bind.address}}" port="{$messageStorePort}" />
+ <xsl:comment> Mapping for smooks.esb.xml </xsl:comment><xsl:text>
+</xsl:text>
+
+ <service-config name="jboss.esb:service=SmooksService"
+ delegateClass="org.jboss.services.binding.XSLTFileDelegate">
+ <delegate-config>
+ <xslt-config configName="PropertyFile"><![CDATA[
+<xsl:stylesheet
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+ <xsl:output method="xml"/>
+
+ <xsl:param name="host"/>
+ <xsl:param name="port"/>
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template match="entry[@key='java.naming.provider.url']">
+ <entry key="java.naming.provider.url">jnp://<xsl:value-of select='$host'/>:<xsl:value-of select='$port'/></entry>
+ </xsl:template>
+
+ <xsl:template match="*|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
+]]>
+ </xslt-config>
+ <binding host="${{jboss.bind.address}}" port="{$jndiPort}" />
+ </delegate-config>
</service-config><xsl:text>
- </xsl:text></xsl:copy>
+</xsl:text>
+ </xsl:copy>
</xsl:template>
<xsl:template name="identity" match="@*|node()">
Modified: labs/jbossesb/trunk/product/install/conf/esb.juddi.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/esb.juddi.xml 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/install/conf/esb.juddi.xml 2007-10-29 20:45:36 UTC (rev 16145)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!--
+ Do not add the DOCTYPE to this file otherwise transformation will not
+ work when offline.
+ -->
<properties>
<comment>
jUDDI Registry Properties (used by RegistryServer)
Modified: labs/jbossesb/trunk/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service.xml 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/install/jboss-service.xml 2007-10-29 20:45:36 UTC (rev 16145)
@@ -3,7 +3,7 @@
<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>
+ <attribute name="PropertyFile">jbossesb-properties.xml</attribute>
</mbean>
<mbean code="org.jboss.internal.soa.esb.services.registry.RegistryService"
name="jboss.esb:service=ESBRegistry">
@@ -12,7 +12,7 @@
<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>
+ <attribute name="PropertiesResourceFile">esb.juddi.xml</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
<depends>jboss.esb:service=PropertyService</depends>
</mbean>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-10-29 20:45:36 UTC (rev 16145)
@@ -62,17 +62,28 @@
protected void startService() throws Exception
{
logger.info("starting juddi RMI service");
- final File xmlPropertyFile ;
+ final String propertiesResourceFileVal ;
if (propertiesResourceFile == null)
{
- URL url = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_PROPERTIES_RESOURCE_FILE);
- URI uri = new URI(url.toString());
- xmlPropertyFile = new File(uri) ;
+ propertiesResourceFileVal = DEFAULT_PROPERTIES_RESOURCE_FILE ;
}
else
{
- xmlPropertyFile = new File(propertiesResourceFile) ;
+ propertiesResourceFileVal = propertiesResourceFile ;
}
+ final File baseFile = new File(propertiesResourceFileVal) ;
+
+ final File xmlPropertyFile ;
+ if (baseFile.isAbsolute())
+ {
+ xmlPropertyFile = baseFile ;
+ }
+ else
+ {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourceFileVal);
+ URI uri = new URI(url.toString());
+ xmlPropertyFile = new File(uri) ;
+ }
final ServerConfig serverConfig = ServerConfigLocator.locate() ;
final File dataDir = serverConfig.getServerDataDir() ;
final File juddiPropertyFile = new File(dataDir, JUDDI_PROPERTIES_RESOURCE_FILE) ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/PropertiesHelper.java 2007-10-29 20:45:36 UTC (rev 16145)
@@ -21,14 +21,26 @@
*/
package org.jboss.internal.soa.esb.util;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
import java.util.Properties;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
/**
* Utility functions for processing property files.
* @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
@@ -36,6 +48,22 @@
public class PropertiesHelper
{
/**
+ * Identity transform which adds the properties DOCTYPE to the output stream.
+ */
+ private static final String IDENTITY_TRANSFORM =
+ "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>" +
+ " <xsl:output method='xml' doctype-system='http://java.sun.com/dtd/properties.dtd'/>" +
+ " <xsl:template match='/'>" +
+ " <xsl:apply-templates/>" +
+ " </xsl:template>" +
+ " <xsl:template match='*|@*'>" +
+ " <xsl:copy>" +
+ " <xsl:apply-templates select='@*|node()'/>" +
+ " </xsl:copy>" +
+ " </xsl:template>" +
+ "</xsl:stylesheet>" ;
+
+ /**
* Translate a property file from an XML format to a text format.
* @param xmlPropertyFile The XML file
* @param propertyFile The property file
@@ -75,14 +103,46 @@
* @return The properties
* @throws IOException for errors during reading/writing.
*/
- public static Properties translateXMLToText(final FileInputStream xmlPropertyInputStream,
- final FileOutputStream propertyOutputStream, final String propertyFileComments)
+ public static Properties translateXMLToText(final InputStream xmlPropertyInputStream,
+ final OutputStream propertyOutputStream, final String propertyFileComments)
throws IOException
{
+ /*
+ * Hack, to include the doctype into the property XML.
+ * If this is included in the XML file then the ServiceBinding transformation
+ * does not work when offline (cannot set URI resolvers).
+ */
+ final TransformerFactory transformerFactory = TransformerFactory.newInstance() ;
+ final Source identitySource = new StreamSource(new StringReader(IDENTITY_TRANSFORM)) ;
+ final Transformer transformer ;
+ try
+ {
+ transformer = transformerFactory.newTransformer(identitySource) ;
+ }
+ catch (final TransformerConfigurationException tce)
+ {
+ final IOException ioe = new IOException("Failed to configure identity transformation") ;
+ ioe.initCause(tce) ;
+ throw ioe ;
+ }
+
+ final ByteArrayOutputStream result = new ByteArrayOutputStream() ;
+ try
+ {
+ transformer.transform(new StreamSource(xmlPropertyInputStream), new StreamResult(result)) ;
+ }
+ catch (final TransformerException te)
+ {
+ final IOException ioe = new IOException("Failed to evaluate the identity transformation") ;
+ ioe.initCause(te) ;
+ throw ioe ;
+ }
+ // END of transformation hack
+
final Properties xmlProperties = new Properties() ;
- final BufferedInputStream bis = new BufferedInputStream(xmlPropertyInputStream) ;
+ final ByteArrayInputStream bais = new ByteArrayInputStream(result.toByteArray()) ;
- xmlProperties.loadFromXML(bis) ;
+ xmlProperties.loadFromXML(bais) ;
final BufferedOutputStream bos = new BufferedOutputStream(propertyOutputStream) ;
xmlProperties.store(bos, propertyFileComments) ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-10-29 20:45:36 UTC (rev 16145)
@@ -38,6 +38,7 @@
import org.jboss.soa.esb.addressing.PortReference;
import org.jboss.soa.esb.addressing.XMLUtil;
import org.jboss.soa.esb.addressing.PortReference.Extension;
+import org.jboss.soa.esb.common.Configuration;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -252,7 +253,7 @@
if (destinationType.equals(QUEUE_TYPE)
|| destinationType.equals(TOPIC_TYPE))
{
- String uri = "localhost"; // a default URI
+ String uri = Configuration.getJndiServerURL();
String name = null;
PortReference addr = new PortReference();
@@ -378,7 +379,7 @@
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
}
if(!properties.containsKey(Context.PROVIDER_URL)) {
- properties.setProperty(Context.PROVIDER_URL, "localhost");
+ properties.setProperty(Context.PROVIDER_URL, Configuration.getJndiServerURL());
}
return properties;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2007-10-29 20:45:36 UTC (rev 16145)
@@ -22,7 +22,6 @@
import java.io.File;
-import org.jboss.soa.esb.ConfigurationException;
import org.jboss.system.ServiceMBeanSupport;
/**
@@ -64,7 +63,14 @@
if (propertyFile != null)
{
final File propertyFile = new File(this.propertyFile) ;
- System.setProperty(Environment.PROPERTIES_FILE, "abs://" + propertyFile.getAbsolutePath());
+ if (propertyFile.isAbsolute())
+ {
+ System.setProperty(Environment.PROPERTIES_FILE, "abs://" + propertyFile.getAbsolutePath());
+ }
+ else
+ {
+ System.setProperty(Environment.PROPERTIES_FILE, this.propertyFile);
+ }
}
}
}
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2007-10-29 20:45:36 UTC (rev 16145)
@@ -26,6 +26,10 @@
import org.apache.log4j.Logger;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
import java.util.Properties;
/**
@@ -53,13 +57,30 @@
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) ;
+ final File baseFile = new File(propertyFile) ;
+ final InputStream xmlPropertyIS ;
+ if (!baseFile.isAbsolute()) {
+ final URL resourceURL = Thread.currentThread().getContextClassLoader().getResource(propertyFile) ;
+ xmlPropertyIS = resourceURL.openStream() ;
+ } else {
+ xmlPropertyIS = new FileInputStream(baseFile) ;
+ }
- PropertiesHelper.translateXMLToText(xmlPropertyFile, smooksPropertyFile, SMOOKS_PROPERTY_FILE_COMMENTS) ;
- SmooksConfiguration.setDefaultConfiguration(smooksPropertyFile.getAbsolutePath()) ;
+ try {
+ final ServerConfig serverConfig = ServerConfigLocator.locate() ;
+ final File dataDir = serverConfig.getServerDataDir() ;
+ final File smooksPropertyFile = new File(dataDir, SMOOKS_PROPERTY_FILE) ;
+
+ final FileOutputStream smooksPropertyOS = new FileOutputStream(smooksPropertyFile) ;
+ try {
+ PropertiesHelper.translateXMLToText(xmlPropertyIS, smooksPropertyOS, SMOOKS_PROPERTY_FILE_COMMENTS) ;
+ SmooksConfiguration.setDefaultConfiguration(smooksPropertyFile.getAbsolutePath()) ;
+ } finally {
+ smooksPropertyOS.close() ;
+ }
+ } finally {
+ xmlPropertyIS.close() ;
+ }
}
Properties smooksEsbConfig = new SmooksConfiguration();
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml 2007-10-29 20:45:36 UTC (rev 16145)
@@ -2,7 +2,7 @@
<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>
+ <attribute name="PropertyFile">smooks.esb.xml</attribute>
<depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
</mbean>
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks.esb.xml 2007-10-29 20:45:36 UTC (rev 16145)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!--
+ Do not add the DOCTYPE to this file otherwise transformation will not
+ work when offline.
+ -->
<properties>
<!--
Configure in the following property to enable config loading
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/jboss-esb.xml 2007-10-29 19:01:51 UTC (rev 16144)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/jboss-esb.xml 2007-10-29 20:45:36 UTC (rev 16145)
@@ -2,9 +2,7 @@
<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
<providers>
- <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
- jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
- jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
+ <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
<jms-bus busid="DataFilerChannel">
<jms-message-filter
dest-type="QUEUE"
More information about the jboss-svn-commits
mailing list