[jboss-svn-commits] JBL Code SVN: r15722 - in labs/jbossesb/trunk/product/samples/trailblazer: client/resources and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Oct 10 12:01:38 EDT 2007


Author: tcunning
Date: 2007-10-10 12:01:38 -0400 (Wed, 10 Oct 2007)
New Revision: 15722

Added:
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml
Removed:
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-service.xml
Modified:
   labs/jbossesb/trunk/product/samples/trailblazer/build.xml
   labs/jbossesb/trunk/product/samples/trailblazer/client/resources/web.xml
   labs/jbossesb/trunk/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java
   labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/deployment.xml
   labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
Log:
bug:JBESB-1088
Use JSR-181 POJO, and fix queue files to work with both ESB server and JBoss
AS.


Modified: labs/jbossesb/trunk/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/build.xml	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/build.xml	2007-10-10 16:01:38 UTC (rev 15722)
@@ -38,9 +38,9 @@
 
 	<property environment="env" />
 
-        <property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
-        <property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/lib"/>
-        <property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
+	<property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
+	<property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/lib"/>
+	<property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
 
 	<available file="${esb.lib.file}"
             filepath="${soa.esb.lib.dist.dir}"
@@ -54,13 +54,6 @@
 
 	<property name="soa.esb.lib.ext.dir" value="${soa.esb.lib.dir}/ext"/>
 
-	<!-- wstools classpath -->
-	<path id="wstools.classpath">
-		<fileset dir="${client.dir}/lib/ext/jboss-jaxws.jar"/>
-		<fileset dir="${client.dir}/lib/ext/jbossws-client.jar"/>
-		<fileset dir="${esb.samples.trailblazer.client.lib.dir}" includes="*.jar"/>
-	</path>	
-
 	<!-- classpath -->
 	<path id="esb.samples.trailblazer.esb.classpath">
 		<fileset dir="${soa.esb.lib.dir}/ext" includes="*.jar"/>
@@ -88,6 +81,7 @@
 		<fileset dir="${soa.esb.lib.ext.dir}"/>
 		<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/>
+		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
 		<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
@@ -99,28 +93,35 @@
 		<delete dir="${esb.samples.trailblazer.client.dest}"/>
 	</target>
 
-	<!-- =================================================================== -->
-	<!-- wstools is not currently used, but is useful for producing WS	 -->
-	<!-- deployment files.							 -->
-	<!-- =================================================================== -->
-	<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
-		<classpath>
-			<pathelement location="client/lib/ext/jboss-jaxws.jar"/>
-			<pathelement location="client/lib/ext/jbossws-core.jar"/>	
-			<pathelement location="${esb.home.dir}/lib/ext/activation.jar"/>
-			<pathelement location="${esb.home.dir}/lib/ext/jbossall-client.jar"/>
-			<pathelement location="${esb.home.dir}/lib/ext/mail.jar"/>
-			<pathelement path="${esb.samples.trailblazer.client.classes.dir}"/>
-		</classpath>
-	</taskdef>   
+    <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"/>
+		<condition property="messaging.present">
+			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+		</condition>
+		<condition property="messaging.present">
+			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+        </condition>
 
-	<target name="wstools">
-		<wstools
-			dest="client/WEB-INF"
-			config="client/resources/wstools-config.xml"
-		/>
-	</target>
+        <condition property="jbossmq.present">
+            <not>
+                <isset property="messaging.present"/>
+            </not>
+        </condition>
+    </target>
+	
+	<!-- dependencies specific to JBoss Messaging -->
+    <target name="messaging-dependencies" if="messaging.present">
+        <property name="jms.service.file" value="jbm-queue-service.xml"/>
+        <property name="jms.description" value="JBoss Messaging"/>
+    </target>
 
+    <!-- dependencies specific to JBoss MQ -->
+    <target name="jbossmq-dependencies" if="jbossmq.present">
+        <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+        <property name="jms.description" value="JBoss MQ"/>
+    </target>
+
 	<!-- =================================================================== -->
 	<!-- Prepares the directory structure                                    -->
 	<!-- =================================================================== -->
@@ -166,9 +167,11 @@
 	</target>
 
 	<!-- JAR/WAR targets -->
-	<target name="esb.jar" depends="compile" >
+	<target name="esb.jar" depends="messaging-config, messaging-dependencies, jbossmq-dependencies, compile" >
 		<property name="esb.build.dir" value="${esb.dest}" />
 
+		<echo>${jms.service.file}</echo>
+
 	        <!-- ESB Client JAR -->
 		<echo message="Building Trailblazer ESB archives"/>
 		<jar destfile="${esb.build.dir}/dist/trailblazer-esb.jar"
@@ -182,7 +185,7 @@
 	        <jar destfile="${esb.build.dir}/dist/trailblazer.esb">
         	    <fileset dir="${classes.dir}" excludes="**/web/*.class" />            
       	    	    <fileset dir="${esb.build.dir}" includes="META-INF/**" />
-	    	    <fileset dir="esb/conf" includes="jbmq-service.xml"/>
+	    	    <fileset dir="${basedir}/esb/conf" includes="${jms.service.file}"/>
 	            <fileset dir="${basedir}" includes="trailblazer.properties,template/**" />
         	</jar>
 	</target>
@@ -200,8 +203,6 @@
 				<include name="trailblazer.properties"/>
 			</classes>
 			<webinf dir="${basedir}/client/resources">
-				<include name="jaxrpc-mapping.xml"/>
-				<include name="webservices.xml"/>
 				<include name="wsdl/*"/>
 			</webinf>
 			<lib dir="${esb.dest}/dist">

Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/resources/web.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/resources/web.xml	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/resources/web.xml	2007-10-10 16:01:38 UTC (rev 15722)
@@ -3,19 +3,10 @@
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> 
 	<servlet> 
 		<servlet-name>LoanBroker</servlet-name> 
-		<servlet-class>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerWS</servlet-class>
+		<servlet-class>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerBean</servlet-class>
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>LoanBroker</servlet-name>
 		<url-pattern>/LoanBroker</url-pattern>
 	</servlet-mapping>
-	<service-ref>
-		<service-ref-name>service/LoanBrokerService</service-ref-name>
-		<service-interface>javax.xml.rpc.Service</service-interface>
-		<wsdl-file>WEB-INF/wsdl/LoanBrokerService.wsdl</wsdl-file>
-		<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-		<port-component-ref>
-		 <service-endpoint-interface>org.jboss.soa.esb.samples.trailblazer.web.LoanBrokerWS</service-endpoint-interface>
-		</port-component-ref>
-	</service-ref>
 </web-app>

Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='LoanBrokerService' targetNamespace='http://org.jboss.ws/samples/rpcstyle' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/samples/rpcstyle/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/rpcstyle' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='LoanBrokerService' targetNamespace='http://localhost/trailblazer' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://localhost/trailblazer' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
  <types>
-  <schema targetNamespace='http://org.jboss.ws/samples/rpcstyle/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/samples/rpcstyle/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-   <complexType name='WebCustomer'>
-    <sequence>
-     <element name='address' nillable='true' type='string'/>
-     <element name='email' nillable='true' type='string'/>
-     <element name='employerName' nillable='true' type='string'/>
-     <element name='loanAmount' type='double'/>
-     <element name='loanDuration' type='int'/>
-     <element name='name' nillable='true' type='string'/>
-     <element name='salary' type='double'/>
-     <element name='ssn' type='int'/>
-    </sequence>
-   </complexType>
-  </schema>
+  <xs:schema targetNamespace='http://localhost/trailblazer' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+   <xs:complexType name='webCustomer'>
+    <xs:sequence>
+     <xs:element minOccurs='0' name='address' type='xs:string'/>
+     <xs:element minOccurs='0' name='email' type='xs:string'/>
+     <xs:element minOccurs='0' name='employerName' type='xs:string'/>
+     <xs:element name='loanAmount' type='xs:double'/>
+     <xs:element name='loanDuration' type='xs:int'/>
+     <xs:element minOccurs='0' name='name' type='xs:string'/>
+     <xs:element name='salary' type='xs:double'/>
+     <xs:element name='ssn' type='xs:int'/>
+    </xs:sequence>
+   </xs:complexType>
+  </xs:schema>
  </types>
- <message name='LoanBrokerInterface_RequestLoan' xmlns='http://schemas.xmlsoap.org/wsdl/'>
-  <part name='WebCustomer_1' type='ns1:WebCustomer'/>
+ <message name='LoanBrokerInterface_RequestLoan'>
+  <part name='webCustomer_1' type='tns:webCustomer'></part>
  </message>
- <message name='LoanBrokerInterface_RequestLoanResponse'/>
+ <message name='LoanBrokerInterface_RequestLoanResponse'></message>
  <portType name='LoanBrokerInterface'>
-  <operation name='RequestLoan' parameterOrder='WebCustomer_1'>
-   <input message='tns:LoanBrokerInterface_RequestLoan'/>
-   <output message='tns:LoanBrokerInterface_RequestLoanResponse'/>
+  <operation name='RequestLoan' parameterOrder='webCustomer_1'>
+   <input message='tns:LoanBrokerInterface_RequestLoan'></input>
+   <output message='tns:LoanBrokerInterface_RequestLoanResponse'></output>
   </operation>
  </portType>
  <binding name='LoanBrokerInterfaceBinding' type='tns:LoanBrokerInterface'>
@@ -31,16 +30,16 @@
   <operation name='RequestLoan'>
    <soap:operation soapAction=''/>
    <input>
-    <soap:body namespace='http://org.jboss.ws/samples/rpcstyle' use='literal'/>
+    <soap:body namespace='http://localhost/trailblazer' use='literal'/>
    </input>
    <output>
-    <soap:body namespace='http://org.jboss.ws/samples/rpcstyle' use='literal'/>
+    <soap:body namespace='http://localhost/trailblazer' use='literal'/>
    </output>
   </operation>
  </binding>
  <service name='LoanBrokerService'>
   <port binding='tns:LoanBrokerInterfaceBinding' name='LoanBrokerInterfacePort'>
-   <soap:address location='http://localhost:8080/trailblazer/LoanBroker'/>
+   <soap:address location='http://127.0.0.1:8080/trailblazer/LoanBroker'/>
   </port>
  </service>
 </definitions>

Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,8 +1,9 @@
 package org.jboss.soa.esb.samples.trailblazer.loanbroker;
 
 import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.URL;
 import org.jboss.soa.esb.samples.trailblazer.web.*;
 
 /**
@@ -19,8 +20,12 @@
 	public static void request(WebCustomer customer) { 
 		try {
 			InitialContext iniCtx = new InitialContext(); 
-			Service service = (Service)iniCtx.lookup("java:comp/env/service/LoanBrokerService");
-			LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class);
+			//Service service = (Service)iniCtx.lookup("java:comp/env/service/LoanBrokerService");
+			//LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class);
+            Service service = Service.create(
+                    new URL("http://localhost:8080/trailblazer/LoanBroker?wsdl"),
+                    new QName("http://localhost/trailblazer","LoanBrokerService") );
+            LoanBrokerInterface port = (LoanBrokerInterface)service.getPort(LoanBrokerInterface.class );
 			port.RequestLoan(customer);
 		} catch (Exception e) {
 			e.printStackTrace();

Added: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -0,0 +1,25 @@
+package org.jboss.soa.esb.samples.trailblazer.web;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.samples.trailblazer.loanbroker.LoanBroker;
+
+ at WebService(name = "LoanBrokerInterface", targetNamespace = "http://localhost/trailblazer", serviceName = "LoanBrokerService")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public class LoanBrokerBean {
+		private static Logger logger = Logger.getLogger(LoanBrokerBean.class);
+		
+	   @WebMethod
+	   public void RequestLoan(@WebParam(name="webCustomer_1") WebCustomer webCustomer_1)
+	   {
+			logger.info("WebCustomer received: \n" + webCustomer_1);
+			
+			LoanBroker broker = new LoanBroker();
+			broker.processLoanRequest(webCustomer_1);
+	   }
+}
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,10 +1,17 @@
 package org.jboss.soa.esb.samples.trailblazer.web;
 
-import java.rmi.Remote;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
 
-/**
- * The Loan broker web interface, which will handle a loan request. 
- */
-public interface LoanBrokerInterface extends Remote {
-   public void RequestLoan(WebCustomer webCustomer_1) throws java.rmi.RemoteException;
+ at WebService(name = "LoanBrokerInterface", targetNamespace = "http://localhost/trailblazer")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface LoanBrokerInterface {
+    @WebMethod
+    public void RequestLoan(
+        @WebParam(name = "webCustomer_1", partName = "webCustomer_1")
+        WebCustomer webCustomer_1);
+
 }

Deleted: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWS.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- * 
- */
-package org.jboss.soa.esb.samples.trailblazer.web;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.log4j.Logger;
-import org.jboss.soa.esb.samples.trailblazer.loanbroker.LoanBroker;
-
-/**
- * The Loan broker web service, which will handle a loan request. 
- */
- at WebService(name = "LoanBrokerWS",
-		targetNamespace = "http://localhost/trailblazer")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public class LoanBrokerWS implements LoanBrokerInterface {
-	private static final long serialVersionUID = 1L;
-	private static Logger logger = Logger.getLogger(LoanBrokerWS.class);
-		
-	@WebMethod
-	public void RequestLoan(WebCustomer customer) {
-		logger.info("WebCustomer received: \n" + customer);
-			
-		LoanBroker broker = new LoanBroker();
-		broker.processLoanRequest(customer);
-	}
-}

Deleted: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerWSService.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,59 +0,0 @@
-
-package org.jboss.soa.esb.samples.trailblazer.web;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-
-
-/**
- * JBossWS Generated Source
- * 
- * Generation Date: Thu May 24 11:21:38 EDT 2007
- * 
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- * 
- * JAX-WS Version: 2.0
- * 
- */
- at WebServiceClient(name = "LoanBrokerWSService", targetNamespace = "http://localhost/trailblazer", wsdlLocation = "http://localhost:8080/trailblazer/LoanBroker?wsdl")
-public class LoanBrokerWSService
-    extends Service
-{
-
-    private final static URL LOANBROKERWSSERVICE_WSDL_LOCATION;
-
-    static {
-        URL url = null;
-        try {
-            url = new URL("http://localhost:8080/trailblazer/LoanBroker?wsdl");
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        LOANBROKERWSSERVICE_WSDL_LOCATION = url;
-    }
-
-    public LoanBrokerWSService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public LoanBrokerWSService() {
-        super(LOANBROKERWSSERVICE_WSDL_LOCATION, new QName("http://localhost/trailblazer", "LoanBrokerWSService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns LoanBrokerWS
-     */
-    @WebEndpoint(name = "LoanBrokerWSPort")
-    public LoanBrokerWS getLoanBrokerWSPort() {
-        return (LoanBrokerWS)super.getPort(new QName("http://localhost/trailblazer", "LoanBrokerWSPort"), LoanBrokerWS.class);
-    }
-
-}

Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/deployment.xml	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/deployment.xml	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,7 +1,7 @@
 <jbossesb-deployment>
-  <depends>jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue</depends>
-  <depends>jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply</depends>
-  <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankRequestQueue</depends>
-  <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankResponseQueue</depends>
-  <depends>jboss.mq.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue</depends>
+  <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue</depends>
+  <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply</depends>
+  <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankRequestQueue</depends>
+  <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankResponseQueue</depends>
+  <depends>jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue</depends>
 </jbossesb-deployment>

Added: labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-queue-service.xml	2007-10-10 16:01:38 UTC (rev 15722)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankRequestQueue">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankResponseQueue">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.trailblazer.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+
+</server>

Deleted: labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-service.xml	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbmq-service.xml	2007-10-10 16:01:38 UTC (rev 15722)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=esb-tb-creditAgencyQueue_reply">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=esb-tb-bankRequestQueue">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=esb-tb-bankResponseQueue">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=esb-tb-bankGatewayResponseQueue">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-
-</server>

Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java	2007-10-10 14:42:36 UTC (rev 15721)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java	2007-10-10 16:01:38 UTC (rev 15722)
@@ -137,7 +137,7 @@
 			System.out.println("creating the registry schema...");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            String sqlCreateCmd    = FileUtil.readStream(is);
+            sqlCreateCmd    = FileUtil.readStream(is);
 			stmnt.execute(sqlCreateCmd);
 			System.out.println("inserting registry publishers...");
 			String sqlInsertPubCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "import.sql"));




More information about the jboss-svn-commits mailing list