[jboss-svn-commits] JBL Code SVN: r16674 - in labs/jbossesb/workspace/dbevenius/redeliver: IDE/JBossIDE/product and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 19 04:02:20 EST 2007
Author: beve
Date: 2007-11-19 04:02:20 -0500 (Mon, 19 Nov 2007)
New Revision: 16674
Added:
labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jsr173_1.0_ri.jar
Modified:
labs/jbossesb/workspace/dbevenius/redeliver/
labs/jbossesb/workspace/dbevenius/redeliver/IDE/JBossIDE/product/.classpath
labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.odt
labs/jbossesb/workspace/dbevenius/redeliver/product/install/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml
labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/build.xml
Log:
Merge from main
Property changes on: labs/jbossesb/workspace/dbevenius/redeliver
___________________________________________________________________
Name: svnmerge-integrated
- /labs/jbossesb/trunk:1-16380
+ /labs/jbossesb/trunk:1-16673
Modified: labs/jbossesb/workspace/dbevenius/redeliver/IDE/JBossIDE/product/.classpath
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/IDE/JBossIDE/product/.classpath 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/IDE/JBossIDE/product/.classpath 2007-11-19 09:02:20 UTC (rev 16674)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.0.1.jar"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/src"/>
+ <classpathentry kind="src" path="build/schema-model/src"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/src"/>
<classpathentry kind="lib" path="etc/test/resources/log4j/dev"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -12,13 +14,10 @@
<classpathentry kind="lib" path="lib/ext/emma.jar"/>
<classpathentry kind="lib" path="lib/ext/groovy-all-1.0.jar"/>
<classpathentry kind="lib" path="lib/ext/hsqldb.jar"/>
- <classpathentry kind="lib" path="lib/ext/jaxr-api-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossall-client.jar"/>
<classpathentry kind="lib" path="lib/ext/jboss-system.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossts-common.jar"/>
<classpathentry kind="lib" path="lib/ext/jsch-0.1.jar"/>
- <classpathentry kind="lib" path="lib/ext/juddi-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="lib/ext/juddi-client-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ext/junit-4.1.jar"/>
<classpathentry kind="lib" path="lib/ext/log4j.jar"/>
<classpathentry kind="lib" path="lib/ext/mail.jar"/>
@@ -26,15 +25,12 @@
<classpathentry kind="lib" path="lib/ext/ognl-2.6.9.jar"/>
<classpathentry kind="lib" path="lib/ext/opencsv-1.6.jar"/>
<classpathentry kind="lib" path="lib/ext/properties-plugin.jar"/>
- <classpathentry kind="lib" path="lib/ext/scout-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/ext/stax-api-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/ext/xalan-2.7.0.jar"/>
<classpathentry kind="lib" path="lib/ext/xbean.jar"/>
<classpathentry kind="lib" path="lib/ext/xercesImpl-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/ext/xml-apis-1.3.02.jar"/>
<classpathentry kind="lib" path="lib/ext/xmlpublic.jar"/>
- <classpathentry kind="lib" path="lib/ext/xstream-1.1.3.jar"/>
- <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/ext/jboss.jar"/>
<classpathentry kind="lib" path="lib/ext/commons-io-1.3.jar"/>
<classpathentry kind="lib" path="lib/ext/edtftpj-1.5.4.jar"/>
@@ -48,7 +44,6 @@
<classpathentry kind="lib" path="ftp/lib/slf4j-log4j12-1.3.0.jar"/>
<classpathentry kind="lib" path="services/jbpm/lib/ext/asm.jar"/>
<classpathentry kind="lib" path="services/jbpm/lib/ext/dom4j.jar"/>
- <classpathentry kind="lib" path="services/jbpm/lib/ext/hibernate3.jar"/>
<classpathentry kind="lib" path="services/jbpm/lib/ext/jbpm-identity.jar"/>
<classpathentry kind="lib" path="services/jbpm/lib/ext/jbpm-jpdl.jar"/>
<classpathentry kind="lib" path="lib/ext/jgroups-all.jar"/>
@@ -67,5 +62,18 @@
<classpathentry kind="lib" path="lib/ext/jbossweb.jar"/>
<classpathentry kind="lib" path="lib/ext/stringtemplate-3.0.jar"/>
<classpathentry kind="lib" path="lib/ext/trove.jar"/>
+ <classpathentry kind="lib" path="lib/ext/jakarta-oro-2.0.8.jar"/>
+ <classpathentry kind="lib" path="lib/ext/commons-ssl-0.3.4.jar"/>
+ <classpathentry kind="lib" path="services/jbrules/lib/ext/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="lib" path="lib/ext/mvel14-1.2rc4rv908.jar"/>
+ <classpathentry kind="lib" path="lib/ext/quartz-1.5.2.jar"/>
+ <classpathentry kind="lib" path="lib/ext/jaxr-api-1.0rc1.jar"/>
+ <classpathentry kind="lib" path="lib/ext/jboss-jaxb-intros.jar"/>
+ <classpathentry kind="lib" path="lib/ext/scout-1.0rc1.jar"/>
+ <classpathentry kind="lib" path="lib/ext/commons-codec-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/ext/juddi-20071022.191630-27.jar"/>
+ <classpathentry kind="lib" path="lib/ext/juddi-client-20071022.191630-6.jar"/>
+ <classpathentry kind="lib" path="lib/ext/xstream-1.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/ext/jsr173_1.0_ri.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/build-distr.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -49,10 +49,6 @@
<include name="*.txt"/>
</fileset>
</copy>
- <ant antfile="./tools/console/build.xml"
- target="deploy-mgmt-console">
- <property name="console.dir" location="./tools/console"/>
- </ant>
</target>
<target name="ftp-server" unless="skip.ftp.server">
@@ -60,58 +56,11 @@
</target>
<target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
- <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
- <fileset dir="${build.dir}/jbossesb.sar">
- <include name="**/*"/>
- </fileset>
- </copy>
-<!--
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="ftp/build">
- <include name="ftp-server.sar/**/*"/>
- </fileset>
- </copy>
--->
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="tools/configeditor/editor/dist">
- <include name="jbossesb-config-editor.war"/>
- </fileset>
- <fileset dir="tools/console/contract-web/build">
- <include name="contract.war"/>
- </fileset>
- </copy>
- <copy todir="${esbserver.dist.dir}/server/default/conf">
- <fileset dir="tools/configeditor/editor/resources">
- <include name="action-templates.xml"/>
- </fileset>
- </copy>
- <!-- copy services -->
- <copy todir="${esbserver.dist.dir}/server/default/deploy">
- <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
- <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
- <fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
- <fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
- <fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
- <fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
- <fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
- <fileset dir="build/jbossesb/lib" includes="soapui-client.sar/**/*"/>
- </copy>
-
- <!-- initialise the ESB bindings -->
- <ant dir="install" target="deploy.bindings" inheritAll="false">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
+ <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
+ inheritall="false">
+ <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
+ <property name="org.jboss.esb.server.config" value="default"/>
</ant>
-
- <!-- initialise the WS modifications -->
- <ant dir="install" target="patch-jbossws" inheritAll="false">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- </ant>
- <ant dir="install/jbpm-patch" target="replace">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- </ant>
</target>
<target name="unpack.server.zip" unless="skip.server.esb">
@@ -170,6 +119,12 @@
<!-- Quartz -->
<fileset dir="${lib.ext.dir}" includes="quartz*.jar"/>
</copy>
+ <copy todir="${build.dir}/jbossesb.sar">
+ <fileset dir="${installation.files.dir}/jUDDI-registry" includes="juddi.war"/>
+ </copy>
+ <copy todir="${build.lib.dir}">
+ <fileset dir="build" includes="jbossesb.sar/**"/>
+ </copy>
</target>
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/build.xml 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/build.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -406,9 +406,6 @@
<fileset dir="lib/ext" includes="jboss-jaxb-intros.jar"/>
</copy>
<ant antfile="build-distr.xml" target="dist" />
- <copy todir="${org.jboss.esb.internal.jar.dest}">
- <fileset dir="build" includes="jbossesb.sar/**"/>
- </copy>
</target>
<!-- Build the tools into the main dist -->
@@ -460,9 +457,14 @@
<zipfileset dir="${org.jboss.esb.internal.dest}/jbossesb"
prefix="jbossesb-${version}"/>
</zip>
- <zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip"
- basedir="${org.jboss.esb.internal.dest}"
- includes="${esb.server.name}/**"/>
+ <zip zipfile="${org.jboss.esb.internal.dest}/${esb.server.name}.zip">
+ <zipfileset dir="${org.jboss.esb.internal.dest}"
+ includes="${esb.server.name}/bin/*.sh"
+ filemode="755"/>
+ <zipfileset dir="${org.jboss.esb.internal.dest}"
+ includes="${esb.server.name}/**"
+ excludes="${esb.server.name}/bin/*.sh"/>
+ </zip>
</target>
<target name="tools" description="builds the tools into the main dist">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/docs/MessageActionGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/install/build.xml 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/install/build.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -7,8 +7,10 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
- <property name="hadeploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy-hasingleton"/>
+ <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+ <property name="deploy.dir" value="${server.dir}/deploy"/>
+ <property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
<property name="product.dir" location=".."/>
@@ -146,11 +148,18 @@
<!-- contracts app -->
<copy file="${org.jboss.esb.dist}/tools/contract/contract.war" todir="${deploy.dir}" />
+ <!-- config-editor app -->
+ <copy file="${org.jboss.esb.dist}/tools/configeditor/dist/jbossesb-config-editor.war" todir="${deploy.dir}" />
+ <copy file="${org.jboss.esb.dist}/tools/configeditor/resources/action-templates.xml" todir="${conf.dir}" />
<ant dir="jbpm-patch" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
+ <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
</target>
@@ -164,6 +173,8 @@
<delete dir="${deploy.dir}/soap.esb" />
<delete dir="${deploy.dir}/soapui-client.sar" />
<delete dir="${deploy.dir}/contract.war" />
+ <delete dir="${deploy.dir}/jbossesb-config-editor.war" />
+ <delete dir="${conf.dir}/action-templates.xml" />
</target>
<property name="org.jboss.esb.tomcat.55lib"
@@ -230,7 +241,9 @@
</target>
<target name="patch-jbossws" depends="check.deploy.props, dependencies" description="Deploys JAXB Intros to the application server">
- <property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
+ <echo message="***** DEPRECATED: Patch no longer required!" />
+ <!--
+ <property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
<property name="jbossws.beans.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.xml"/>
<property name="jbossws.beans.tmp.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.new.xml"/>
@@ -247,6 +260,7 @@
</copy>
<antcall target="apply-jbossws-xslt" />
+ -->
</target>
<target name="apply-jbossws-xslt" unless="jaxb.intros.exist">
Copied: labs/jbossesb/workspace/dbevenius/redeliver/product/lib/ext/jsr173_1.0_ri.jar (from rev 16655, labs/jbossesb/trunk/product/lib/ext/jsr173_1.0_ri.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2007-11-19 09:02:20 UTC (rev 16674)
@@ -22,20 +22,24 @@
package org.jboss.soa.esb.actions.converters;
-import java.util.List;
+import java.util.HashMap;
+import javax.xml.namespace.QName;
+import java.util.Map;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.MessagePayloadProxy;
import org.jboss.soa.esb.message.body.content.BytesBody;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.QNameMap;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
/**
* Object to XML processor.
@@ -47,6 +51,17 @@
* <Action name="Customer-To-XML" processor="ObjectToXStream">
* <property name="class-alias" value="Customer" /> <!-- Class alias used in call to <a href="http://xstream.codehaus.org/javadoc/com/thoughtworks/xstream/XStream.html">XStream.alias(String, Class)</a> prior to serialisation. -->
* <property name="exclude-package" value="false" /> <!-- Default "true". Not applicable if a "class-alias" is specified. -->
+ * <property name="namespace-uri" value="namespace goes here" />
+ * <property name="aliases"> <!-- Optional list of extra aliases to add to XStream -->
+ * <alias name="aliasName" class="className" />
+ * <alias name="aliasName" class="className" />
+ * ...
+ * </property>
+ * <property name="namespaces"> <!-- Optional list of namespaces to register with XStream -->
+ * <namespace namespace-uri="http://www.xyz.com" local-part="xyz" />
+ * <namespace namespace-uri="http://www.xyz.com/x" local-part="x" />
+ * </property>
+ * ...
* </Action>
* </pre>
* <p/>
@@ -54,13 +69,20 @@
* excluded unless "exclude-package" is set to "false"/"no".
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @author <a href="mailto:daniel.bevenius at gmail.com">daniel.bevenius at gmail.com</a>
* @since Version 4.0
*/
public class ObjectToXStream extends AbstractActionPipelineProcessor {
-
+ private Logger log = Logger.getLogger( ObjectToXStream.class );
+
+ public static final String ATTR_CLASS_ALIAS = "class-alias";
+ public static final String ATTR_EXCLUDE_PACKAGE = "exclude-package";
+ public static final String ATTR_NAMESPACE_URI = "namespace-uri";
+ public static final String ATTR_NAMESPACE_LOCALPART = "local-part";
private String classAlias;
private boolean excludePackage;
private MessagePayloadProxy payloadProxy;
+ private Map<String,String> namespaces;
/**
* Public constructor.
@@ -71,8 +93,9 @@
payloadProxy = new MessagePayloadProxy(configTree,
new String[] {BytesBody.BYTES_LOCATION, ActionUtils.POST_ACTION_DATA},
new String[] {ActionUtils.POST_ACTION_DATA});
- classAlias = configTree.getAttribute("class-alias");
- excludePackage = configTree.getAttribute("exclude-package", "true").equals("true");
+ classAlias = configTree.getAttribute(ATTR_CLASS_ALIAS);
+ excludePackage = configTree.getAttribute(ATTR_EXCLUDE_PACKAGE, "true").equals("true");
+ namespaces = getNamespaces(configTree);
}
/* (non-Javadoc)
@@ -87,7 +110,7 @@
throw new ActionProcessingException(e);
}
- XStream xstream = new XStream();
+ XStream xstream = createXStreamInstance();
if(classAlias == null) {
if(excludePackage) {
@@ -107,4 +130,48 @@
return message;
}
+
+ /**
+ * Creates an XStream instance. If namespace mappings have been defined the XStream
+ * instance is created with a StaxDriver configured with those mappings.
+ *
+ * @param aliases Map of aliases.
+ * @throws ActionProcessingException
+ */
+ protected XStream createXStreamInstance() {
+ if (namespaces == null || namespaces.size() == 0) {
+ return new XStream();
+ }
+ else {
+ final QNameMap nsm = new QNameMap();
+ for (Map.Entry<String,String> me : namespaces.entrySet() ) {
+ final String namespaceURI = (String)me.getKey();
+ final String localPart = (String)me.getValue();
+ nsm.registerMapping(new QName(namespaceURI, localPart), localPart);
+ }
+ return new XStream(new StaxDriver(nsm));
+ }
+ }
+
+ /**
+ * Will extract the namespace elements from the passed-in configTree
+ *
+ * @param configTree the configuration for this class
+ *
+ * @return Map<String,String> either an empty map or a map containing the name
+ * space URI as its key and the corresponding value is the local
+ * XML element name to map it to.
+ */
+ protected Map<String,String> getNamespaces(ConfigTree configTree) {
+ Map<String,String> namespaces = new HashMap<String,String>();
+
+ ConfigTree[] children = configTree.getChildren("namespace");
+
+ if (children != null)
+ {
+ for (ConfigTree namespace : children)
+ namespaces.put(namespace.getAttribute(ATTR_NAMESPACE_URI), namespace.getAttribute(ATTR_NAMESPACE_LOCALPART));
+ }
+ return namespaces;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2007-11-19 09:02:20 UTC (rev 16674)
@@ -22,15 +22,11 @@
package org.jboss.soa.esb.actions.converters;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.TestCase;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.actions.TestBean;
-import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
@@ -41,9 +37,12 @@
/**
* ObjectToXStream unit tests.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @author <a href="mailto:daniel.bevenius at gmail.com">daniel.bevenius at gmail.com</a>
* @since Version 4.0
*/
public class ObjectToXStreamUnitTest extends TestCase {
+
+ private Logger log = Logger.getLogger( ObjectToXStreamUnitTest.class );
public void test_default() throws ActionProcessingException {
ConfigTree config = new ConfigTree("config");
@@ -107,4 +106,23 @@
assertEquals("Tom", bean.getName());
assertEquals("1234", bean.getPhone());
}
+
+ public void test_with_namespace() throws ActionProcessingException {
+ final String ns = "http://www.xyz.com.org/xyz";
+ ConfigTree config = new ConfigTree("config");
+
+ config.setAttribute("class-alias", "TomsClass");
+ ConfigTree namespace = new ConfigTree("namespace", config);
+ namespace.setAttribute( ObjectToXStream.ATTR_NAMESPACE_URI, ns);
+ namespace.setAttribute( ObjectToXStream.ATTR_NAMESPACE_LOCALPART, "TomsClass");
+
+ ObjectToXStream objectToXStream = new ObjectToXStream(config);
+
+ Message oMsg = MessageFactory.getInstance().getMessage();
+ oMsg.getBody().add(new TestBean("Tom", "1234"));
+ objectToXStream.process(oMsg);
+ String xml = (String)oMsg.getBody().get();
+ assertTrue( xml.contains( "TomsClass xmlns=\"" + ns ));
+ }
+
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration2/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration2/test/SendJMSMessageDeploy.java 2007-11-19 09:02:20 UTC (rev 16674)
@@ -61,9 +61,21 @@
public void stop() throws JMSException
{
- conn.stop();
- session.close();
- conn.close();
+ try {
+ if(conn != null) {
+ conn.stop();
+ }
+ } finally {
+ try {
+ if(session != null) {
+ session.close();
+ }
+ } finally {
+ if(conn != null) {
+ conn.close();
+ }
+ }
+ }
}
public void sendAMessage(String msg) throws JMSException {
@@ -76,12 +88,19 @@
public static void main(String args[]) throws Exception
- {
- SendJMSMessageDeploy sm = new SendJMSMessageDeploy();
- sm.setupConnection();
- sm.sendAMessage(args[0]);
- sm.stop();
-
+ {
+ SendJMSMessageDeploy sm = new SendJMSMessageDeploy();
+ try {
+ sm.setupConnection();
+ sm.sendAMessage(args[0]);
+ } catch (Exception e) {
+ System.out.println("\n**** Failed to send message to JMS Destination '" + args[0] + "'. " +
+ "\n**** Your JMS Provider (e.g. your JBoss ESB/App Server) may not be running, or the JMS Destination may not be deployed." +
+ "\n**** Exception: " + e.getMessage());
+ } finally {
+ sm.stop();
+ }
+
}
}
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/bpm_orchestration3/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration3/test/SendJMSMessage.java 2007-11-19 09:02:20 UTC (rev 16674)
@@ -20,13 +20,9 @@
*/
package org.jboss.soa.esb.samples.quickstart.bpm_orchestration3.test;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
+import org.jgroups.protocols.JMS;
+
+import javax.jms.*;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -48,10 +44,22 @@
}
public void stop() throws JMSException
- {
- conn.stop();
- session.close();
- conn.close();
+ {
+ try {
+ if(conn != null) {
+ conn.stop();
+ }
+ } finally {
+ try {
+ if(session != null) {
+ session.close();
+ }
+ } finally {
+ if(conn != null) {
+ conn.close();
+ }
+ }
+ }
}
public void sendAMessage(String msg, String tokenID) throws JMSException {
@@ -66,20 +74,22 @@
public static void main(String args[]) throws Exception
- {
- SendJMSMessage sm = new SendJMSMessage();
- try {
- sm.setupConnection(args[0]);
- if (args.length < 3)
- sm.sendAMessage(args[1],null);
- else
- sm.sendAMessage(args[1],args[2]);
- } catch (Exception e) {
- System.out.println(e);
- } finally {
- sm.stop();
- }
-
+ {
+ SendJMSMessage sm = new SendJMSMessage();
+ try {
+ sm.setupConnection(args[0]);
+ if (args.length < 3)
+ sm.sendAMessage(args[1], null);
+ else
+ sm.sendAMessage(args[1], args[2]);
+ } catch (Exception e) {
+ System.out.println("\n**** Failed to send message to JMS Destination '" + args[0] + "'. " +
+ "\n**** Your JMS Provider (e.g. your JBoss ESB/App Server) may not be running, or the JMS Destination may not be deployed." +
+ "\n**** Exception: " + e.getMessage());
+ } finally {
+ sm.stop();
+ }
+
}
}
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/conf/base-build.xml 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/conf/base-build.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -68,7 +68,7 @@
<target name="messaging-config">
<property name="org.jboss.esb.server.deploy.dir"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+ value="${org.jboss.esb.server.server}/deploy"/>
<condition property="messaging.present">
<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
@@ -115,18 +115,42 @@
<!-- ==================================================================== -->
<!-- This section handles dependencies specific to each distribution. -->
<!-- It configures the following properties -->
-<!-- org.jboss.esb.server.config, org.jboss.esb.server.home and -->
-<!-- deployment-classpath -->
+<!-- org.jboss.esb.server.config, org.jboss.esb.server.home, -->
+<!-- org.jboss.esb.server.server and deployment-classpath -->
<!-- ==================================================================== -->
<!-- Configure dependencies for jbossesb and source distributions -->
- <target name="jbossesb-dependencies" if="build.jbossesb">
- <condition property="base.jbossesb"
- value="${product.dir}/build/jbossesb"
- else="${product.dir}">
- <isset property="hierarchy.source"/>
- </condition>
+ <target name="jbossesb-dependencies" depends="jbossesb-source-dependencies, jbossesb-server-dependencies">
+ <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <path id="deployment-classpath">
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.sar/lib" includes="*.jar"/>
+ <!-- jbossesb config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbossesb.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/jbossesb.esb"/>
+ <!-- jbpm config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbpm.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/jbpm.esb"/>
+ <pathelement location="${org.jboss.esb.server.server}/lib/cglib.jar"/>
+ <!-- smooks config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/smooks.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/smooks.esb"/>
+ <!-- jbrules config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jbrules.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/jbrules.esb"/>
+ <!-- spring config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/spring.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/spring.esb"/>
+ <!-- soap config -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+ <!-- general libs -->
+ <pathelement location="${org.jboss.esb.server.server}/lib/commons-logging.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/lib/jboss-system.jar"/>
+ </path>
+ </target>
+
+ <target name="jbossesb-source-dependencies" if="build.jbossesb">
<condition
property="org.jboss.esb.server.config"
value="${quickstart.org.jboss.esb.server.config}">
@@ -158,60 +182,13 @@
<fail unless="org.jboss.esb.server.home" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>
- <path id="deployment-classpath">
- <fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
- <fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
- <!-- jbossesb config -->
- <fileset dir="${base.jbossesb}/lib/jbossesb.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbossesb.esb"/>
- <!-- jbpm config -->
- <fileset dir="${base.jbossesb}/lib/jbpm.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbpm.esb"/>
- <!-- smooks config -->
- <fileset dir="${base.jbossesb}/lib/smooks.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/smooks.esb"/>
- <!-- jbrules config -->
- <fileset dir="${base.jbossesb}/lib/jbrules.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/jbrules.esb"/>
- <!-- spring config -->
- <fileset dir="${base.jbossesb}/lib/spring.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/spring.esb"/>
- <!-- soap config -->
- <fileset dir="${base.jbossesb}/lib/soap.esb" includes="*.jar"/>
- <pathelement location="${base.jbossesb}/lib/soap.esb"/>
- </path>
+ <property name="org.jboss.esb.server" location="${product.dir}/server/${org.jboss.esb.server.config}"/>
</target>
<!-- Configure dependencies for jbossesb-server distribution -->
<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
<property name="org.jboss.esb.server.home" value="${product.dir}"/>
<property name="org.jboss.esb.server.config" value="default"/>
-
- <path id="deployment-classpath">
- <fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
- <!-- jbossesb config -->
- <fileset dir="${product.dir}/server/default/deploy/jbossesb.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbossesb.esb"/>
- <!-- jbpm config -->
- <fileset dir="${product.dir}/server/default/deploy/jbpm.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbpm.esb"/>
- <pathelement location="${product.dir}/server/default/lib/cglib.jar"/>
- <!-- smooks config -->
- <fileset dir="${product.dir}/server/default/deploy/smooks.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/smooks.esb"/>
- <!-- jbrules config -->
- <fileset dir="${product.dir}/server/default/deploy/jbrules.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/jbrules.esb"/>
- <!-- spring config -->
- <fileset dir="${product.dir}/server/default/deploy/spring.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/spring.esb"/>
- <!-- soap config -->
- <fileset dir="${product.dir}/server/default/deploy/soap.esb" includes="*.jar"/>
- <pathelement location="${product.dir}/server/default/deploy/soap.esb"/>
- <!-- general libs -->
- <pathelement location="${product.dir}/server/default/lib/commons-logging.jar"/>
- <pathelement location="${product.dir}/lib/jboss-system.jar"/>
- </path>
</target>
<!-- ==================================================================== -->
@@ -220,12 +197,13 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+ <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
<path refid="quickstart-dependencies-classpath" />
<path refid="quickstart-lib-classpath" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
<path refid="deployment-classpath" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
</path>
@@ -234,12 +212,11 @@
<pathelement location="." />
<pathelement location="${classes}" />
<pathelement location="${basedir}/src" />
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
- <!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.server}/deploy/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
<path refid="compile-classpath" />
<pathelement location="${pwd}/anttasks/classes" />
</path>
@@ -422,7 +399,7 @@
<!-- ==================================================================== -->
<target name="assert-ws-available">
- <available property="ws-spi" file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/jbossws-spi.jar"/>
+ <available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
<condition property="ws-available">
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-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/samples/quickstarts/load_generator/build.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -5,26 +5,25 @@
${line.separator}
</description>
- <property environment="env"/>
-
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml" />
- <property file="${product.dir}/install/deployment.properties" />
- <path id="groovy.classpath">
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
- <include name="jboss-aop-jdk50**/*.jar"/>
- </fileset>
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.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>
+ <target name="init-groovy" depends="dependencies">
+ <path id="groovy.classpath">
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
+ <include name="jboss-aop-jdk50**/*.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.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>
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+ </target>
- <target name="compile-churn" depends="compile" description="compile groovy to bytecode">
+ <target name="compile-churn" depends="compile, init-groovy" description="compile groovy to bytecode">
<mkdir dir="load_generator_classes" />
<copy todir="load_generator_classes" overwrite="true">
<fileset dir="${basedir}/scripts/">
Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/build.xml 2007-11-19 08:02:57 UTC (rev 16673)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/tools/console/management-esb/build.xml 2007-11-19 09:02:20 UTC (rev 16674)
@@ -107,10 +107,10 @@
</target>
<target name="copy-datasource" if="management.ds.available">
- <copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/default/deploy" overwrite="true"/>
+ <copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
</target>
<target name="deploy" depends="esb,copy-datasource" description="Deploy the WAR">
- <copy file="${mgmt.esb.dir}/build/management.esb" todir="${org.jboss.esb.server.home}/server/default/deploy" overwrite="true"/>
+ <copy file="${mgmt.esb.dir}/build/management.esb" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
</target>
</project>
More information about the jboss-svn-commits
mailing list