[jboss-svn-commits] JBL Code SVN: r10157 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 13 12:35:25 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-03-13 12:35:25 -0400 (Tue, 13 Mar 2007)
New Revision: 10157
Modified:
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/StandAloneBootStrapperUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/trunk/product/install/conf/jbossesb.xml
labs/jbossesb/trunk/product/install/jboss-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml
Log:
Changing JNDI context, such that if it is on the server itself we use InitialContext without parameters. The jndi parameters on JMS
no longer required. I had to change the xsd for that. We're now on 1.0.1. This is to fix JNDI lookups on the local server where the objects are passed by reference.
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -45,7 +45,7 @@
<delete dir="${org.jboss.esb.listeners.classes.dir}"/>
</target>
- <target name="generate-config-model-1.0" depends="org.jboss.esb.listeners.prepare">
+ <target name="generate-config-model-1.0.1" depends="org.jboss.esb.listeners.prepare">
<taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="xbeans-classpath" />
<delete dir="${gendir}" /><mkdir dir="${gendir}" />
@@ -53,14 +53,14 @@
classgendir="${gendir}/classes"
javasource="1.5"
srcgendir="${gendir}/src"
- destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.jar"
+ destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.1.jar"
classpathref="xbeans-classpath">
- <fileset dir="${org.jboss.esb.root.dir}/etc/schemas/xml/" includes="jbossesb-1.0.xsd,jbossesb-1.0.xsdconfig"/>
+ <fileset dir="${org.jboss.esb.root.dir}/etc/schemas/xml/" includes="jbossesb-1.0.1.xsd,jbossesb-1.0.1.xsdconfig"/>
</xmlbean>
<!-- now add the xsd to it -->
- <jar destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.jar" update="true"
+ <jar destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.1.jar" update="true"
basedir="${org.jboss.esb.root.dir}/etc/schemas/xml/"
- includes="jbossesb-1.0.xsd"/>
+ includes="jbossesb-1.0.1.xsd"/>
</target>
<path id="xbeans-classpath">
@@ -76,7 +76,7 @@
<ant inheritAll="true" dir="tests" target="org.jboss.esb.listeners.tests.compile"/>
</target>
- <target name="org.jboss.esb.listeners.internal.compile" depends="generate-config-model-1.0"
+ <target name="org.jboss.esb.listeners.internal.compile" depends="generate-config-model-1.0.1"
description="Compile all classes">
<javac
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -124,14 +124,11 @@
String type = getAttrAndWarn(tree, JMSEpr.DESTINATION_TYPE_TAG,
"queue");
- String jndiURL = getAttrAndWarn(tree, JMSEpr.JNDI_URL_TAG,
- "localhost");
+ String jndiURL = getAttrAndWarn(tree, JMSEpr.JNDI_URL_TAG,"");
String jndiContextFactory = getAttrAndWarn(tree,
- JMSEpr.JNDI_CONTEXT_FACTORY_TAG,
- NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY);
+ JMSEpr.JNDI_CONTEXT_FACTORY_TAG,"");
String jndiPkgPrefix = getAttrAndWarn(tree,
- JMSEpr.JNDI_PKG_PREFIX_TAG,
- NamingContext.JBOSS_URL_PKG_PREFIX);
+ JMSEpr.JNDI_PKG_PREFIX_TAG,"");
String jmsFactoryClass = getAttrAndWarn(tree,
JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -56,7 +56,7 @@
{
private static final int SLEEP_MILLIS = 1000; // default interval between parameter reloads
private static final int ENDED_MILLIS = 20000; // default interval between parameter reloads
- private static final String JBOSSESB_XSD = "/jbossesb-1.0.xsd";
+ private static final String JBOSSESB_XSD = "/jbossesb-1.0.1.xsd";
private final Logger mLogger = Logger.getLogger(this.getClass());
private final Lock endedLock = new ReentrantLock() ;
private final Condition endedChanged = endedLock.newCondition() ;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -331,19 +331,17 @@
_queueSession = null;
_queue = null;
- String sJndiURL = ListenerUtil.obtainAtt(_config, JMSEpr.JNDI_URL_TAG,
- NamingContext.JBOSS_PROVIDER_URL);
+ String sJndiURL = ListenerUtil.obtainAtt(_config, JMSEpr.JNDI_URL_TAG,"");
if (null == _config.getAttribute(JMSEpr.JNDI_URL_TAG))
_logger
.debug("No value specified for " + JMSEpr.JNDI_URL_TAG + " attribute" + " - Using default of: '" + sJndiURL + "'");
String sJndiContextFactory = ListenerUtil.obtainAtt(_config,
- JMSEpr.JNDI_CONTEXT_FACTORY_TAG,
- NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY);
+ JMSEpr.JNDI_CONTEXT_FACTORY_TAG,"");
if (null == _config.getAttribute(JMSEpr.JNDI_CONTEXT_FACTORY_TAG))
_logger
.debug("No value specified for " + JMSEpr.JNDI_CONTEXT_FACTORY_TAG + " attribute" + " - Using default of: '" + sJndiContextFactory + "'");
String sJndiPkgPrefix = ListenerUtil.obtainAtt(_config,
- JMSEpr.JNDI_PKG_PREFIX_TAG, NamingContext.JBOSS_PROVIDER_URL);
+ JMSEpr.JNDI_PKG_PREFIX_TAG, "");
if (null == _config.getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG))
_logger
.debug("No value specified for " + JMSEpr.JNDI_PKG_PREFIX_TAG + " attribute" + " - Using default of: '" + sJndiPkgPrefix + "'");
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/StandAloneBootStrapperUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/StandAloneBootStrapperUnitTest.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/StandAloneBootStrapperUnitTest.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -79,7 +79,7 @@
{
}
- StandAloneBootStrapper bootstrapper = new StandAloneBootStrapper("install/conf/jbossesb.xml", "etc/schemas/xml/jbossesb-1.0.xsd");
+ StandAloneBootStrapper bootstrapper = new StandAloneBootStrapper("install/conf/jbossesb.xml", "etc/schemas/xml/jbossesb-1.0.1.xsd");
bootstrapper.requestEnd();
bootstrapper.runAfter();
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -67,7 +67,7 @@
gatewayFile.delete();
}
String validationFileName = TestEnvironmentUtil.getUserDir("product")
- + "etc/schemas/xml/jbossesb-1.0.xsd";
+ + "etc/schemas/xml/jbossesb-1.0.1.xsd";
// Make sure this file exists
File validationFile = new File(validationFileName);
if (!validationFile.exists()){
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,5 +1,5 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
<providers>
<jms-provider name="JBossMQ" connection-factory="ConnectionFactory" jndi-URL="jnp://localhost:1099">
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,5 +1,5 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
<providers>
<provider name="JBossMQ">
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,5 +1,5 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd" >
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" >
<!--
This is a bad configuration. The listener below is of the base listener type, yet it references a non-base type bus (jms-bus).
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -131,15 +131,12 @@
oNewAtts.put(COMMAND_JNDI_NAME, sJndiName);
- String sJndiURL = obtainAtt(p_oP, COMMAND_JNDI_URL,
- NamingContext.JBOSS_PROVIDER_URL);
+ String sJndiURL = obtainAtt(p_oP, COMMAND_JNDI_URL,"");
oNewAtts.put(COMMAND_JNDI_URL, sJndiURL);
String sJndiContextFactory = obtainAtt(p_oP,
- COMMAND_JNDI_CONTEXT_FACTORY,
- NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY);
+ COMMAND_JNDI_CONTEXT_FACTORY,"");
oNewAtts.put(COMMAND_JNDI_CONTEXT_FACTORY, sJndiContextFactory);
- String sJndiPkgPrefix = obtainAtt(p_oP, COMMAND_JNDI_PKG_PREFIX,
- NamingContext.JBOSS_URL_PKG_PREFIX);
+ String sJndiPkgPrefix = obtainAtt(p_oP, COMMAND_JNDI_PKG_PREFIX,"");
oNewAtts.put(COMMAND_JNDI_PKG_PREFIX, sJndiPkgPrefix);
Context oJndiCtx = NamingContext.getServerContext(sJndiURL,
sJndiContextFactory, sJndiPkgPrefix);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -242,14 +242,8 @@
try
{
String sJndiConnectionFactory = _epr.getJndiContextFactory();
- if (Util.isNullString(sJndiConnectionFactory))
- sJndiConnectionFactory = NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY;
String sJndiURL = _epr.getJndiURL();
- if (Util.isNullString(sJndiURL))
- sJndiURL = NamingContext.JBOSS_PROVIDER_URL;
String sJndiPkgPrefix = _epr.getJndiPkgPrefix();
- if (Util.isNullString(sJndiPkgPrefix))
- sJndiPkgPrefix = NamingContext.JBOSS_URL_PKG_PREFIX;
oJndiCtx = NamingContext.getServerContext(sJndiURL,
sJndiConnectionFactory, sJndiPkgPrefix);
@@ -421,14 +415,8 @@
try
{
String sJndiConnectionFactory = _epr.getJndiContextFactory();
- if (Util.isNullString(sJndiConnectionFactory))
- sJndiConnectionFactory = NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY;
String sJndiURL = _epr.getJndiURL();
- if (Util.isNullString(sJndiURL))
- sJndiURL = NamingContext.JBOSS_PROVIDER_URL;
String sJndiPkgPrefix = _epr.getJndiPkgPrefix();
- if (Util.isNullString(sJndiPkgPrefix))
- sJndiPkgPrefix = NamingContext.JBOSS_URL_PKG_PREFIX;
oJndiCtx = NamingContext.getServerContext(sJndiURL,
sJndiConnectionFactory, sJndiPkgPrefix);
if (null == oJndiCtx)
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -31,7 +31,6 @@
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.PortReference;
import org.jboss.soa.esb.addressing.XMLUtil;
-import org.jboss.soa.esb.helpers.NamingContext;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -132,7 +131,7 @@
/**
* Create a new JMS EPR. The protocol version is assumed to be 1.1. ,
- * jndi_type=jboss, jndi_url=localhost, messageSelector=null
+ * jndi_type="", jndi_url="", messageSelector=null
*
* @param destinationType
* the type of destination (queue/topic).
@@ -146,8 +145,7 @@
String connection)
{
this(ONE_ONE_PROTOCOL, destinationType, destinationName, connection,
- NamingContext.JBOSS_PROVIDER_URL,
- NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY, null, null);
+ "","", null, null);
}
/**
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -57,18 +57,22 @@
String initialContextFactory, String urlPkgPrefixes)
{
Properties properties = new Properties();
- properties.setProperty(Context.PROVIDER_URL, providerUrl);
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
- if (urlPkgPrefixes!=null && !"".equals(urlPkgPrefixes)) {
- properties.setProperty(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
- }
+ if (providerUrl!=null )properties.setProperty(Context.PROVIDER_URL, providerUrl);
+ if (initialContextFactory!=null) properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
+ if (urlPkgPrefixes!=null) properties.setProperty(Context.URL_PKG_PREFIXES, urlPkgPrefixes);
boolean bCtxOK = false;
Context oCtx = null;
for (int i1 = 0; (!bCtxOK) && i1 < MAX_RETRIES; i1++) {
// check if context is valid
try {
- oCtx = new InitialContext(properties);
+ if ((providerUrl ==null || "".equals(providerUrl))
+ && (initialContextFactory == null || "".equals(initialContextFactory))
+ && (urlPkgPrefixes == null || "".equals(urlPkgPrefixes))) {
+ oCtx = new InitialContext();
+ } else {
+ oCtx = new InitialContext(properties);
+ }
oCtx.list("__dummy2@#$%");
bCtxOK = true;
} catch (NamingException nex) {
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-03-13 16:35:25 UTC (rev 10157)
@@ -43,7 +43,7 @@
System.out.println(props);
assertEquals("org.jnp.interfaces.NamingContextFactory", props.get(Context.INITIAL_CONTEXT_FACTORY));
assertEquals("http://localhost:1234", props.get(Context.PROVIDER_URL));
- assertEquals(null, props.get("java.naming.factory.url.pkgs"));
+ assertEquals("", props.get("java.naming.factory.url.pkgs"));
ctx.close();
}
}
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2007-03-13 16:35:25 UTC (rev 10157)
@@ -2,7 +2,7 @@
<!--Generated by Turbo XML 2.4.1.100. Conforms to w3c http://www.w3.org/2001/XMLSchema-->
<xsd:schema
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jesb="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
+ xmlns:jesb="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
targetNamespace="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
elementFormDefault="qualified">
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,3 +1,3 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd" parameterReloadSecs="50">
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="50">
</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -11,6 +11,6 @@
<depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
</mbean>
<loader-repository>
- jboss.messaging:loader=ScopedLoaderRepository
+ org.jboss.soa.esb:loader=jbossesb.sar
</loader-repository>
</server>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,13 +1,8 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
- xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
- parameterReloadSecs="5">
+<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-context-factory="org.jnp.interfaces.NamingContextFactory"
- jndi-URL="localhost" >
+ <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
<jms-bus busid="quickstartGwChannel">
<jms-message-filter
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/AggregatorTest.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,5 +1,5 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
parameterReloadSecs="10">
<!-- for activemq use:
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml 2007-03-13 14:26:40 UTC (rev 10156)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml 2007-03-13 16:35:25 UTC (rev 10157)
@@ -1,5 +1,5 @@
<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
parameterReloadSecs="10">
<!-- for activemq use:
More information about the jboss-svn-commits
mailing list