7:23 a.m.
Author: jeff.yuchang
Date: 2009-07-19 08:23:53 -0400 (Sun, 19 Jul 2009)
New Revision: 675
Removed:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/install/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
cdl/trunk/samples/jbossesb/client/build.xml
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
Log:
SOAG-110, update the sample's client module.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-07-19 09:49:26 UTC (rev 674)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-07-19 12:23:53 UTC (rev 675)
@@ -42,7 +42,7 @@
<directory>../runtime/jbossesb/target</directory>
<outputDirectory>modules/runtime-jbossesb-${cdl.version}</outputDirectory>
<includes>
- <include>overlord-cdl-runtime.esb.zip</include>
+ <include>overlord-cdl-runtime.esb-dist.zip</include>
</includes>
</fileSet>
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2009-07-19 09:49:26 UTC (rev
674)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2009-07-19 12:23:53 UTC (rev
675)
@@ -27,7 +27,7 @@
<target name="deploy-cdl-runtime" description="Deploys Overlord CDL
Runtime to the server">
<echo message="Deploy overlord cdl runtime to JBoss ESB server"
/>
- <unzip
src="${modules}/runtime-jbossesb-${cdl.version}/overlord-cdl-runtime.esb.zip"
dest="${deploy.dir}" />
+ <unzip
src="${modules}/runtime-jbossesb-${cdl.version}/overlord-cdl-runtime.esb-dist.zip"
dest="${deploy.dir}" />
</target>
<target name="undeploy-cdl-runtime" description="Undeploys Overlord
CDL Runtime">
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-07-19
09:49:26 UTC (rev 674)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-07-19
12:23:53 UTC (rev 675)
@@ -1,6 +1,6 @@
<project name="base-build" basedir=".">
- <property file="../../../../install/deployment.properties" />
+ <property file="../../../install/deployment.properties" />
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2009-07-19 09:49:26 UTC (rev 674)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2009-07-19 12:23:53 UTC (rev 675)
@@ -47,7 +47,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>config</id>
+ <id>dist</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-07-19 09:49:26 UTC
(rev 674)
+++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-07-19 12:23:53 UTC
(rev 675)
@@ -1,6 +1,6 @@
<assembly xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
- <id>config</id>
+ <id>dist</id>
<formats>
<format>zip</format>
</formats>
Modified: cdl/trunk/samples/jbossesb/client/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/client/build.xml 2009-07-19 09:49:26 UTC (rev 674)
+++ cdl/trunk/samples/jbossesb/client/build.xml 2009-07-19 12:23:53 UTC (rev 675)
@@ -6,15 +6,15 @@
<property name="classes.dir" value="${basedir}/target/classes"
/>
<property name="src.dir" value="${basedir}/src" />
<property name="org.jboss.esb.server.server"
value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"
/>
- <property name="org.jboss.esb.server.deploy.dir"
value="${org.jboss.esb.server.server}/deploy" />
+ <property name="org.jboss.esb.server.deploy.dir"
value="${org.jboss.esb.server.server}/deploy" />
<path id="project.classpath">
<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.home}/lib/endorsed"
includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/lib/endorsed"
includes="*.jar" /> <!-- Required for JMS Client Code. -->
<fileset
dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer"
includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code.
-->
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
</path>
@@ -46,13 +46,6 @@
</target>
- <target name="runStatelessPurchasingClient"
depends="compile">
- <java fork="yes"
classname="com.acme.services.buyer.StatelessBuyerClient">
- <classpath refid="project.classpath" />
- <classpath location="${classes.dir}" />
- </java>
- </target>
-
<target name="runBrokerageClient" depends="compile">
<java fork="yes"
classname="com.acme.services.buyer.BrokerClient">
<classpath refid="project.classpath" />
@@ -60,11 +53,4 @@
</java>
</target>
- <target name="runStatelessBrokerageClient" depends="compile">
- <java fork="yes"
classname="com.acme.services.buyer.StatelessBrokerClient">
- <classpath refid="project.classpath" />
- <classpath location="${classes.dir}" />
- </java>
- </target>
-
</project>
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
===================================================================
---
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2009-07-19
09:49:26 UTC (rev 674)
+++
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2009-07-19
12:23:53 UTC (rev 675)
@@ -31,7 +31,7 @@
*/
public class BrokerClient {
- private static Logger logger = Logger.getLogger(BuyerClient.class);
+ private static Logger logger = Logger.getLogger(BrokerClient.class);
private ServiceInvoker brokerInvoker;
@@ -40,7 +40,7 @@
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
try {
- brokerInvoker = new ServiceInvoker("ESBBroker.BrokerParticipant",
"ESBBrokerProcess");
+ brokerInvoker = new ServiceInvoker("org.pi4soa.esbbroker.esbbroker",
"ESBBrokerProcess_Broker");
} catch (Exception e) {
throw new RuntimeException("Failed to create ServiceInvoker", e);
}
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
===================================================================
---
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2009-07-19
09:49:26 UTC (rev 674)
+++
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2009-07-19
12:23:53 UTC (rev 675)
@@ -35,11 +35,11 @@
private ServiceInvoker storeInvoker;
public BuyerClient() {
-
+
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
try {
- storeInvoker = new ServiceInvoker("PurchaseGoods.Store",
"Store.main");
+ storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods",
"PurchaseGoodsProcess_Store");
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Failed to create ServiceInvoker", e);
Deleted:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java
===================================================================
---
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java 2009-07-19
09:49:26 UTC (rev 674)
+++
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java 2009-07-19
12:23:53 UTC (rev 675)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package com.acme.services.buyer;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-
-/**
- * @author jeffyu
- *
- */
-public class StatelessBrokerClient {
-
- private static Logger logger = Logger.getLogger(BuyerClient.class);
-
- private ServiceInvoker brokerInvoker;
-
- public StatelessBrokerClient() {
-
-
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-
- try {
- brokerInvoker = new ServiceInvoker("org.pi4soa.esbbroker.esbbroker",
"ESBBrokerProcess_Broker");
- } catch (Exception e) {
- throw new RuntimeException("Failed to create ServiceInvoker", e);
- }
- }
-
- public void run() {
-
- String id = "20";
-
- String quoteReq="<enquiry id=\"" + id +"\"
></enquiry>";
-
- Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- mesg.getBody().add(quoteReq);
-
mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure",
"true");
-
- try {
- System.out.println("=========================================");
- System.out.println("Request: " + mesg.getBody().get());
- Message reply=brokerInvoker.deliverSync(mesg, 50000);
- System.out.println("Reply: "+reply.getBody().get());
-
- Thread.sleep(5000);//Waiting...
-
- System.out.println("Sending Buy request to Broker...");
- String buyReq = "<buy id=\"" + id + "\"
supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\&...
quoteValue=\"10\"></buy>";
- mesg.getBody().add(buyReq);
-
- System.out.println("Request: " + mesg.getBody().get());
- reply = brokerInvoker.deliverSync(mesg, 50000);
- System.out.println("Reply: " + reply.getBody().get());
- System.out.println("=========================================");
- } catch (Exception e) {
- logger.error(e);
- e.printStackTrace();
- }
- }
-
- public static void main(String[] args) {
- StatelessBrokerClient client=new StatelessBrokerClient();
- client.run();
- }
-}
Deleted:
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
===================================================================
---
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java 2009-07-19
09:49:26 UTC (rev 674)
+++
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java 2009-07-19
12:23:53 UTC (rev 675)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package com.acme.services.buyer;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
-
-/**
- * @author gary
- */
-public class StatelessBuyerClient {
-
- private static Logger logger = Logger.getLogger(StatelessBuyerClient.class);
-
- private ServiceInvoker storeInvoker;
-
- public StatelessBuyerClient() {
-
-
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-
- try {
- storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods",
"PurchaseGoodsProcess_Store");
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Failed to create ServiceInvoker", e);
- }
- }
-
- public void run() {
-
- String buyReq="<BuyRequest id=\"5\"
></BuyRequest>";
-
- Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
- mesg.getBody().add(buyReq);
-
mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure",
"true");
-
- try {
- System.out.println("=========================================");
- System.out.println("Request: "+mesg.getBody().get());
- Message reply=storeInvoker.deliverSync(mesg, 20000);
-
- if (reply != null) {
- System.out.println("Reply: "+reply.getBody().get());
- } else {
- System.err.println("NO REPLY");
- }
- System.out.println("=========================================");
- } catch (Exception e) {
- logger.error(e);
- e.printStackTrace();
- }
- }
-
- public static void main(String[] args) {
- StatelessBuyerClient client=new StatelessBuyerClient();
-
- client.run();
- }
-
-}