[jboss-svn-commits] JBL Code SVN: r27961 - in labs/jbossesb/trunk/product: samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2 and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 13 12:31:02 EDT 2009
Author: dward
Date: 2009-07-13 12:31:02 -0400 (Mon, 13 Jul 2009)
New Revision: 27961
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyRequestAction.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyResponseAction.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
Log:
reverted some changes so the underlying problem isn't masked per
https://jira.jboss.org/jira/browse/JBESB-2711
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/build.xml 2009-07-13 16:09:00 UTC (rev 27960)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/build.xml 2009-07-13 16:31:02 UTC (rev 27961)
@@ -1,65 +1,71 @@
-<project name="Quickstart_webservice_consumer_wise2" default="deploy" basedir=".">
-
- <description>
- ${ant.project.name}
- ${line.separator}
- </description>
-
+<project name="Quickstart_webservice_consumer_wise2" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
<property name="additional.deploys" value="wise-core.properties,smooks-request-config.xml,smooks-response-config.xml" />
-
+
<!-- Import the base Ant build script... -->
- <import file="../conf/base-build.xml"/>
-
-
- <property name="war.build.dir" location="${build.dir}/war/classes"/>
-
-
- <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+ <import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-assemblies" depends="makewar"/>
-
- <target name="makewar" description="make war">
- <!-- Compile... -->
- <mkdir dir="${war.build.dir}" />
- <javac srcdir="war/src" destdir="${war.build.dir}" debug="true">
- <classpath>
- <path refid="compile-classpath" />
- <fileset dir="war/lib/ext" includes="*.jar" />
- </classpath>
- </javac>
-
- <!-- War... -->
- <war warfile="build/${ant.project.name}.war"
- webxml="${basedir}/war/resources/WEB-INF/web.xml">
- <webinf dir="${basedir}/war/resources/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <classes dir="${war.build.dir}" includes="**/*.class"/>
- <fileset dir="${basedir}/war/view">
- <include name="**/*"/>
- </fileset>
- <classes dir="${basedir}">
- <include name="juddi.properties"/>
- </classes>
- </war>
- </target>
-
- <target name="deploy-war" depends="prepare-deployment, makewar">
- <copy todir="${org.jboss.esb.server.deploy.dir}"
- file="${build.dir}/${ant.project.name}.war"/>
- </target>
-
- <target name="undeploy-war" depends="dependencies">
- <delete verbose="true" quiet="true"
- file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.war"/>
- </target>
+ <property name="war.build.dir" location="${build.dir}/war/classes"/>
+ <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+
+ <target name="quickstart-specific-assemblies" depends="makewar"/>
+
+ <target name="makewar" description="make war">
+ <!-- Compile... -->
+ <mkdir dir="${war.build.dir}" />
+ <javac srcdir="war/src" destdir="${war.build.dir}" debug="true">
+ <classpath>
+ <path refid="compile-classpath" />
+ <fileset dir="war/lib/ext" includes="*.jar" />
+ </classpath>
+ </javac>
+
+ <!-- War... -->
+ <war warfile="build/${ant.project.name}.war"
+ webxml="${basedir}/war/resources/WEB-INF/web.xml">
+ <webinf dir="${basedir}/war/resources/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <classes dir="${war.build.dir}" includes="**/*.class"/>
+ <fileset dir="${basedir}/war/view">
+ <include name="**/*"/>
+ </fileset>
+ <classes dir="${basedir}">
+ <include name="juddi.properties"/>
+ </classes>
+ </war>
+ </target>
+
+ <target name="deploy-war" depends="prepare-deployment, makewar">
+ <copy todir="${org.jboss.esb.server.deploy.dir}"
+ file="${build.dir}/${ant.project.name}.war"/>
+ </target>
+
+ <target name="undeploy-war" depends="dependencies">
+ <delete verbose="true" quiet="true"
+ file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.war"/>
+ </target>
+
+ <target name="sendjms" depends="compile">
+ <echo>Send JMS message that triggers webservice call</echo>
+ <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.test.SendJMSMessage" failonerror="true">
+ <arg value="Jimbo"/>
+ <classpath refid="exec-classpath"/>
+ </java>
+ </target>
+
<target name="runtest" depends="compile">
- <echo>Send ESB message that triggers webservice call</echo>
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.test.SendEsbMessage" failonerror="true">
- <arg value="Jimbo"/>
+ <echo>Send ESB message that triggers webservice call</echo>
+ <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.test.SendEsbMessage" failonerror="true">
+ <arg value="Jimbo"/>
<classpath refid="exec-classpath"/>
- </java>
- </target>
-
-</project>
+ </java>
+ </target>
+
+</project>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/jboss-esb.xml 2009-07-13 16:09:00 UTC (rev 27960)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/jboss-esb.xml 2009-07-13 16:31:02 UTC (rev 27961)
@@ -8,11 +8,16 @@
connection-factory="ConnectionFactory"
jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
jndi-URL="localhost">
+ <jms-bus busid="quickstartGwChannel">
+ <jms-message-filter
+ dest-type="QUEUE"
+ dest-name="queue/quickstart_webservice_consumer_wise2_Request_gw" />
+ </jms-bus>
<jms-bus busid="quickstartEsbChannel">
- <jms-message-filter dest-type="QUEUE"
+ <jms-message-filter
+ dest-type="QUEUE"
dest-name="queue/quickstart_webservice_consumer_wise2_esb" />
</jms-bus>
-
</jms-provider>
</providers>
@@ -21,7 +26,10 @@
description="Helloworld Webservice Consumer">
<listeners>
<jms-listener name="JMS-ESBListener"
- busidref="quickstartEsbChannel"/>
+ busidref="quickstartEsbChannel" />
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ is-gateway="true" />
</listeners>
<actions mep="OneWay">
<action name="request-mapper"
@@ -34,11 +42,13 @@
<property name="SOAPAction" value="pingComplexObject"/>
<property name="EndPointName" value="PingWSPort"/>
<property name="SmooksRequestMapper" value="smooks-request-config.xml"/>
+ <property name="SmooksRequestReport" value="/home/dward/tmp/smooks-request-report.html"/>
<property name="SmooksResponseMapper" value="smooks-response-config.xml"/>
+ <property name="SmooksResponseReport" value="/home/dward/tmp/smooks-response-report.html"/>
<property name="LoggingMessages" value="false" />
<property name="serviceName" value="PingWS"/>
<property name="username" value=""/>
- <property name="password" value=""/>
+ <property name="password" value=""/>
</action>
<action name="response-mapper"
class="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.MyResponseAction">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyRequestAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyRequestAction.java 2009-07-13 16:09:00 UTC (rev 27960)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyRequestAction.java 2009-07-13 16:31:02 UTC (rev 27961)
@@ -20,15 +20,12 @@
*/
package org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2;
+import java.util.HashMap;
+
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import java.util.HashMap;
-import java.util.Map;
-
public class MyRequestAction extends AbstractActionLifecycle
{
protected ConfigTree _config;
@@ -51,7 +48,7 @@
logHeader();
Object msgBody = (Object) message.getBody().get();
HashMap requestMap = new HashMap();
- requestMap.put("complexObject", msgBody);
+ requestMap.put("external", msgBody);
message.getBody().add(requestMap);
System.out.println("Request map is: " + requestMap.toString());
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyResponseAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyResponseAction.java 2009-07-13 16:09:00 UTC (rev 27960)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise2/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer_wise2/MyResponseAction.java 2009-07-13 16:31:02 UTC (rev 27961)
@@ -20,12 +20,11 @@
*/
package org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2;
+import java.util.Map;
+
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.actions.ActionUtils;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import java.util.Map;
public class MyResponseAction extends AbstractActionLifecycle
{
@@ -49,8 +48,7 @@
logHeader();
- //Map responseMsg = (Map) message.getBody().get();
- Object responseMsg = message.getBody().get();
+ Map responseMsg = (Map)message.getBody().get();
System.out.println("Response Map is: " + responseMsg);
logFooter();
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-07-13 16:09:00 UTC (rev 27960)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-07-13 16:31:02 UTC (rev 27961)
@@ -101,11 +101,8 @@
executionContext.setEventListener(new HtmlReportGenerator(this.getSmooksReport()));
}
org.milyn.container.plugin.PayloadProcessor payloadProcessor = new PayloadProcessor(smooks, org.milyn.container.plugin.ResultType.JAVA);
- // smooks should return a map
- // TODO: verify with some unit tests
- return (Map<String, Object>) payloadProcessor.process(originalObjects, executionContext);
- // return result.getResultMap();
-
+ Map<String, Object> output = (Map<String, Object>) payloadProcessor.process(originalObjects, executionContext);
+ return output;
}
public String getSmooksResource() {
More information about the jboss-svn-commits
mailing list