Wed Sep 27 13:13:10 EDT 2006

Author: tfennelly
Date: 2006-09-27 13:11:08 -0400 (Wed, 27 Sep 2006)
New Revision: 6444

Added:
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/QuoteRequest.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-csv-0.1.jar
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-templating-0.2.jar
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/opencsv-1.6.jar
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/from__loanbroker.cdrl
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/smooks-cdr.lst
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/to____jmsbank.cdrl
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.8-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-misc-0.2.jar
   labs/jbossesb/trunk/product/lib/ext/xalan-2.7.0.jar
Removed:
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/xstream-1.1.3.jar
   labs/jbossesb/trunk/product/lib/ext/dtdparser-1.21.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.7.2-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-javabean-0.1.1.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-misc-0.1.1.jar
   labs/jbossesb/trunk/product/lib/ext/milyn-smooks-templating-0.2.jar
Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java
   labs/jbossesb/trunk/product/core/services/build.xml
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/conf/LoanBrokerConfig.xml.template
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessEmail.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/adapters/CustomerAdapter.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/web/client/WebCustomer.java
   labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/log4j.xml
Log:
Smooks integration and trailblazer updates

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java
===================================================================

--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -124,6 +124,7 @@
     public Object process(Object message) {
         if(message instanceof String) {
             byte[] messageBytes = null;
+            String transformedMessage;
             
             try {
                 messageBytes = ((String)message).getBytes(messageEnc);
@@ -134,7 +135,14 @@
             // TODO: Cater for more message input types e.g. InputStream, DOM Document...
             // TODO: Cater for more message output types e.g. InputStream, DOM Document...
 
-            return smooks.filterAndSerialize(messageUseragent, new ByteArrayInputStream(messageBytes));
+            long start = System.currentTimeMillis();
+            transformedMessage = smooks.filterAndSerialize(messageUseragent, new ByteArrayInputStream(messageBytes));
+            if(logger.isDebugEnabled()) {
+            	long timeTaken = System.currentTimeMillis() - start;
+            	logger.debug("Transformed message [" + message + "] for useragent [" + messageUseragent + "]. Time taken: " + timeTaken + ".  Result:\n" + transformedMessage);
+            }
+            
+            return transformedMessage;
         } else {
             logger.warn("String message types only supported.  Input message was [" + message.getClass().getName() + "].  Returning message untransformed.");
             return message;

Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/core/services/build.xml	2006-09-27 17:11:08 UTC (rev 6444)
@@ -29,9 +29,7 @@
 	    <!-- Define the class path                                               -->
 	    <!-- =================================================================== -->
 	    <path id="org.jboss.esb.services.base.classpath">
-	        <fileset dir="${org.jboss.esb.ext.lib.dir}"  
-			includes="*.jar" excludes="jbossall-client.jar"
-			/>
+	        <fileset dir="${org.jboss.esb.ext.lib.dir}"  includes="*.jar" excludes="jbossall-client.jar"/>
 	    	<fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
 	    </path>
 

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml	2006-09-27 17:11:08 UTC (rev 6444)
@@ -10,10 +10,16 @@
 	<property name="org.jboss.esb.samples.loanbroker.test.dir"         value="${basedir}/test"/>
 	<property name="org.jboss.esb.samples.loanbroker.jar.dest"         value="${basedir}/build/dist/lib/"/>
 	<property name="org.jboss.esb.samples.loanbroker.lib.ext.dir"      value="${basedir}/lib"/>
+	<property name="org.jboss.esb.samples.loanbroker.smooks"      	   value="${basedir}/transform/smooks"/>
 	<property name="org.jboss.esb.samples.loanbroker.tests.report.dir" value="${basedir}/build/tests"/>
 	<property environment="env" />
-		
+
+	<!--
+		TODO: Can these classpaths be cleaned up any???
+	-->
+	
 	<path id="org.jboss.esb.samples.loanbroker.classpath">
+	    <pathelement location="${org.jboss.esb.samples.loanbroker.smooks}"/>
 	    <fileset dir="${org.jboss.esb.samples.loanbroker.lib.ext.dir}" includes="*.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/client" 
 			includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
@@ -23,9 +29,13 @@
 			includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib" 
 			includes="jbossesb-common.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
+		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/lib/ext" 
+			includes="milyn*.jar commons*.jar xerces*.jar xalan*.jar xml-apis*.jar jbossts-common.jar"/>
 	</path>
 	<path id="org.jboss.esb.samples.loanbroker.testclasspath">
-	    <fileset dir="${org.jboss.esb.samples.loanbroker.lib.ext.dir}" includes="*.jar"/>
+	    <pathelement location="${org.jboss.esb.samples.loanbroker.smooks}"/>
+
+		<fileset dir="${org.jboss.esb.samples.loanbroker.lib.ext.dir}" includes="*.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/client" 
 			includes="jbossall-client.jar jbossws-client.jar mail.jar activation.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/server/default/deploy/ejb3.deployer/" 
@@ -34,6 +44,8 @@
 			includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib" 
 			includes="jbossesb-common.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
+		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/lib/ext" 
+			includes="milyn*.jar commons*.jar xerces*.jar xalan*.jar xml-apis*.jar jbossts-common.jar"/>
 	    <pathelement location="${org.jboss.esb.samples.loanbroker.classes.dir}"/>
 	</path>
 	
@@ -130,7 +142,8 @@
 	<target name="runListener" depends="org.jboss.esb.samples.loanbroker.jar">
 		<echo>Running Loan Broker Listsner</echo>
 		<java fork="yes" classname="org.jboss.soa.esb.samples.loanbroker.web.Launcher" failonerror="true">
-			<classpath refid="org.jboss.esb.samples.loanbroker.testclasspath"/>
+			<classpath refid="org.jboss.esb.samples.loanbroker.testclasspath"/>
+			<sysproperty key="org.apache.commons.logging.LogFactory" value="org.apache.commons.logging.impl.Log4jFactory"/>
 		</java>
 	</target>	
 	

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/conf/LoanBrokerConfig.xml.template
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/conf/LoanBrokerConfig.xml.template	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/conf/LoanBrokerConfig.xml.template	2006-09-27 17:11:08 UTC (rev 6444)
@@ -33,7 +33,7 @@
 <CreditAgencyJMSOutput
    	listenerClass="org.jboss.soa.esb.listeners.JmsQueueListener"
 
-   	actions="CreditCheckResponse-To-BankQuote, Route-BankQuote-To-JMSBank-Router, BankQuote-To-CSV, Route-BankQuote-CSV-To-FileBank"
+   	actions="CreditCheckResponse-To-BankQuote, BankQuote-To-CSV, Route-BankQuote-CSV-To-FileBank, Route-BankQuote-CSV-To-JMSBank-Router"
 
    	maxThreads="1"
    	queueConnFactoryClass="ConnectionFactory"
@@ -52,14 +52,14 @@
 <ToJMSBankRouter
    	listenerClass="org.jboss.soa.esb.listeners.JmsQueueListener"
 
-   	actions="BankQuote-To-XML, Route-BankQuote-XML-To-JMSBank"
+   	actions="BankQuote-CSV-To-JMSBankXML, Route-BankQuote-XML-To-JMSBank"
 
    	maxThreads="1"
    	queueConnFactoryClass="ConnectionFactory"
    	listenJndiType="jboss"
    	listenJndiURL="@jndi.host@"
    	listenQueue="queue/A"   	
-   	listenMsgSelector="sample_loanbroker_servicecode='BankQuoteObject'"
+   	listenMsgSelector="sample_loanbroker_servicecode='BankQuoteCSV'"
 > 
 </ToJMSBankRouter>
 
@@ -124,27 +124,25 @@
 		
 		<Action name="CreditCheckResponse-To-BankQuote" processor="CreditResponseProcessor" />
 		
-		<Action name="Route-BankQuote-To-JMSBank-Router" processor="JMSRouter">
-			<property name="jndiName" value="queue/A" />
-	       	<property name="message-prop:sample_loanbroker_servicecode" value="BankQuoteObject" />
-		</Action>
-		
-		<Action name="Route-BankQuote-XML-To-JMSBank" processor="JMSRouter">
-			<property name="jndiName" value="queue/C" />
-		</Action>
-
 		<Action name="BankQuote-To-CSV" processor="ObjectToCSVString">
-			<property name="bean-properties" value="ssn,creditScore,historyLength,loanAmount,loanTerm,customerUID" />
+			<property name="bean-properties" value="ssn,creditScore,creditHistoryLen,amount,term,customerUniqueId" />
 		</Action>
-
 		<Action name="Route-BankQuote-CSV-To-FileBank" processor="ObjectToFileWriter">
 			<property name="file" value="./@trail.runtime.dir@/BankInput" />
 			<property name="ext" value="dat" />
 		</Action>
-
-		<Action name="BankQuote-To-XML" processor="ObjectToXStream">
-			<property name="class-alias" value="org.jboss.soa.esb.samples.loanbroker.banks.BankQuoteRequest" />
+		<Action name="Route-BankQuote-CSV-To-JMSBank-Router" processor="JMSRouter">
+			<property name="jndiName" value="queue/A" />
+	       	<property name="message-prop:sample_loanbroker_servicecode" value="BankQuoteCSV" />
 		</Action>
+		<Action name="BankQuote-CSV-To-JMSBankXML" processor="SmooksTransformer">
+			<property name="message-type" value="BankQuote" />
+			<property name="message-from" value="LoanBroker" />
+			<property name="message-to" value="JMSBank" />
+		</Action>
+		<Action name="Route-BankQuote-XML-To-JMSBank" processor="JMSRouter">
+			<property name="jndiName" value="queue/C" />
+		</Action>
 
 		<Action name="FileToByteArray" processor="FileToByteArray" />
 
@@ -166,6 +164,7 @@
 			<Alias name="FileToByteArray" class="org.jboss.soa.esb.actions.FileToByteArray" />
 			<Alias name="ByteArrayToString" class="org.jboss.soa.esb.actions.ByteArrayToString" />
 			<Alias name="ObjectToXStream" class="org.jboss.soa.esb.actions.ObjectToXStream" />
+			<Alias name="SmooksTransformer" class="org.jboss.soa.esb.actions.SmooksTransformer" />						
 			<Alias name="ToBankQuoteResponse" class="org.jboss.soa.esb.samples.loanbroker.actions.ToBankQuoteResponse" />
 			<Alias name="ProcessBanksResponse" class="org.jboss.soa.esb.samples.loanbroker.actions.ProcessBanksResponse" />						
 		</ProcessorAliases>

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/QuoteRequest.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/QuoteRequest.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/QuoteRequest.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -0,0 +1,127 @@
+/*
+* 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.loanbroker;
+
+import java.io.Serializable;
+
+
+public class QuoteRequest implements Serializable 
+{
+	private static final long serialVersionUID = 1L;
+	public int ssn;
+	public int creditScore;
+	public int creditHistoryLen;
+	public int amount;
+	public int term;
+	public String customerUniqueId;
+	
+	/**
+	 * Gets for the credit score.
+	 * @return credit score
+	 */
+	public int getCreditScore() {
+		return creditScore;
+	}
+	/**
+	 * Sets the credit score.
+	 * @param creditScore
+	 */
+	public void setCreditScore(int creditScore) {
+		this.creditScore = creditScore;
+	}
+	/**
+	 * Gets the credit history length (in months).
+	 * @return credit history length
+	 */
+	public int getCreditHistoryLen() {
+		return creditHistoryLen;
+	}
+	/**
+	 * Sets the credit history length (in months).
+	 * @param creditHistoryLen
+	 */
+	public void setCreditHistoryLen(int historyLength) {
+		this.creditHistoryLen = historyLength;
+	}
+	/**
+	 * Gets the requested loan amount (in dollar).
+	 * @return the loan amount
+	 */
+	public int getAmount() {
+		return amount;
+	}
+	/** 
+	 * Sets the loan amount.
+	 * @param amount - the loan amount (in dollar).
+	 */
+	public void setAmount(int loanAmount) {
+		this.amount = loanAmount;
+	}
+	/**
+	 * Gets the duration of the loan, the term, (in months).
+	 * @return term
+	 */
+	public int getTerm() {
+		return term;
+	}
+	/**
+	 * Sets the term (duration) of the loan (in months)
+	 * @param term
+	 */
+	public void setTerm(int loanTerm) {
+		this.term = loanTerm;
+	}
+	/** 
+	 * Sets the Social Security Number (SSN).
+	 * @return ssn
+	 */
+	public int getSsn() {
+		return ssn;
+	}
+	/**
+	 * Sets the Social Security Number (SSN).
+	 * @param ssn
+	 */
+	public void setSsn(int ssn) {
+		this.ssn = ssn;
+	}
+	/**
+	 * Returns a human readable string representation of this object.
+	 * @return toString
+	 */
+	public String toString() {
+		return this.getClass().getSimpleName() + "=["
+			+ "ssn=" + ssn
+		    + ", creditScore=" + creditScore
+			+ ", creditHistoryLen=" + creditHistoryLen
+			+ ", amount=" + amount
+			+ ", term=" + term
+			+ ", customerUniqueId="+ customerUniqueId + "]";	
+	}
+	
+	public String getCustomerUniqueId() {
+		return customerUniqueId;
+	}
+	public void setCustomerUniqueId(String customerUID) {
+		this.customerUniqueId = customerUID;
+	}
+}

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -57,8 +57,9 @@
     				Configuration.getJndiServerType(), 
     				Configuration.getJndiServerURL());
     
+    		logger.info("Looking up Customer Object - UID=[" + bankResponse.customerUID + "]");
     		Customer customer = (Customer) esbHandler.getObject(org.jboss.soa.esb.samples.loanbroker.domain.Customer.class, bankResponse.customerUID);
-    		logger.info(this.getClass().getSimpleName() + " -- Business Object BEFORE Loan Offer is added: \n" + customer.toDTO().toXml());
+    		logger.info(" -- Business Object BEFORE Loan Offer is added: \n" + customer.toDTO().toXml());
     		
     		//now update this Customer with a LoanOffer based on the response from the Bank
     		LoanOffer offer = new LoanOffer((String)null);

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -28,7 +28,7 @@
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.samples.loanbroker.BankQuote;
+import org.jboss.soa.esb.samples.loanbroker.QuoteRequest;
 import org.jboss.soa.esb.samples.loanbroker.adapters.CustomerAdapter;
 import org.jboss.soa.esb.samples.loanbroker.creditagency.CreditCheckResponseNotification;
 import org.jboss.soa.esb.samples.loanbroker.domain.CreditRating;
@@ -61,6 +61,7 @@
     				Configuration.getJndiServerType(), 
     				Configuration.getJndiServerURL());
     
+    		logger.info("Looking up Customer Object - UID=[" + response.customerUID + "]");
     		Customer customer = (Customer) esbHandler.getObject(org.jboss.soa.esb.samples.loanbroker.domain.Customer.class, response.customerUID);
     		logger.info(this.getClass().getSimpleName() + " -- Business Object BEFORE Credit Rating is added: \n" + customer.toDTO().toXml());
     		CreditRating rating = new CreditRating((String)null);
@@ -71,7 +72,7 @@
     		logger.info(this.getClass().getSimpleName() + " -- Business Object AFTER Credit Rating is added: \n" + customer.toDTO().toXml());
     //		m_oLogger.info(this.getClass().getSimpleName() + " -- Customer2 TEST DEBUG customer2: \n" + customer2.toDTO().toXml());
     		
-            BankQuote quote = CustomerAdapter.bankQuoteFromCustomer(customer);
+            QuoteRequest quote = CustomerAdapter.bankQuoteFromCustomer(customer);
             return quote;
         } catch(Exception e) {
             throw new ActionProcessingException("Failed to process credit check response.", e);

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessEmail.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessEmail.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessEmail.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -46,10 +46,10 @@
 		try {
 			String address = customer.getPerson().getEmailRole("loan");
 			if (null==address) {
-				logger.info("no email address found for customerUID: "+customer.getUid()+" - no email being sent");
+				logger.info("no email address found for customerUniqueId: "+customer.getUid()+" - no email being sent");
 				return;
 			}
-			logger.info("customerUID " + customer.getUid() + " - sending email to: " + address);
+			logger.info("customerUniqueId " + customer.getUid() + " - sending email to: " + address);
 			Email email = new Email();			
 			email.setSendTo(address);
 			email.setSubject("LoanBroker - TrailBlazer Quotes from Banks");

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -26,6 +26,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.helpers.DomElement;
@@ -39,6 +40,7 @@
  */
 public class ToBankQuoteResponse implements ActionProcessor {
     
+	private static Logger logger = Logger.getLogger(ToBankQuoteResponse.class);
     public static final String BANK_QUOTE_RESPONSE_CSV_TO_BANK_QUOTE_RESPONSE = "BankQuoteResponseCSV-To-BankQuoteResponse";
     public static final String BANK_QUOTE_RESPONSE_XML_TO_BANK_QUOTE_RESPONSE = "BankQuoteResponseXML-To-BankQuoteResponse";
 
@@ -61,6 +63,8 @@
             throw new ActionProcessingException("Message must be a " + String.class.getName() + ". Is " + messageIn.getClass().getName());
         }
         
+        logger.info("Deserialising [" + message + "] to an instance of " + BankQuoteResponse.class.getName());
+        
         if(actionName.equalsIgnoreCase(BANK_QUOTE_RESPONSE_XML_TO_BANK_QUOTE_RESPONSE)) {
             bankResponse = fromXML(message);
         } else if(actionName.equalsIgnoreCase(BANK_QUOTE_RESPONSE_CSV_TO_BANK_QUOTE_RESPONSE)) {

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/adapters/CustomerAdapter.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/adapters/CustomerAdapter.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/adapters/CustomerAdapter.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -30,7 +30,7 @@
 import org.jboss.soa.esb.common.bizclasses.OneValue;
 import org.jboss.soa.esb.common.bizclasses.Person;
 import org.jboss.soa.esb.helpers.DomElement;
-import org.jboss.soa.esb.samples.loanbroker.BankQuote;
+import org.jboss.soa.esb.samples.loanbroker.QuoteRequest;
 import org.jboss.soa.esb.samples.loanbroker.banks.BankQuoteResponse;
 import org.jboss.soa.esb.samples.loanbroker.domain.CreditRating;
 import org.jboss.soa.esb.samples.loanbroker.domain.Customer;
@@ -103,15 +103,15 @@
     	return new WebCustomer(sName,sAddr,sEmployer,dSalary,iLoanDur,dAmount,ssn,email);
     }//_________________________________________
 	
-	public static BankQuote bankQuoteFromCustomer(Customer p_o) {
-		BankQuote bankRequest = new BankQuote();
+	public static QuoteRequest bankQuoteFromCustomer(Customer p_o) {
+		QuoteRequest bankRequest = new QuoteRequest();
 		CreditRating rating = p_o.getRating();
 		bankRequest.creditScore = rating.getScore();		
 		String sVal = new DecimalFormat("########0").format(Double.parseDouble(p_o.getField(Customer.ATTRIB.loanAmt)));		
-		bankRequest.loanAmount 	=  Integer.parseInt(sVal);
-		bankRequest.loanTerm	= Integer.parseInt(p_o.getField(Customer.ATTRIB.loanDur));
+		bankRequest.amount 	=  Integer.parseInt(sVal);
+		bankRequest.term	= Integer.parseInt(p_o.getField(Customer.ATTRIB.loanDur));
 		bankRequest.ssn			= Integer.parseInt(p_o.getField(Customer.ATTRIB.ssn));		
-		bankRequest.customerUID	= Long.toString(p_o.getUid());
+		bankRequest.customerUniqueId	= Long.toString(p_o.getUid());
 		
 		return bankRequest;		
 	}
@@ -128,7 +128,7 @@
 		response.interestRate 	= BigDecimal.valueOf(Double.parseDouble(oEl.getTextChildren("interestRate")[0]));
 		response.quoteId		= oEl.getTextChildren("quoteId")[0];
 		response.errorCode		= Integer.parseInt(oEl.getTextChildren("errorCode")[0]);
-		response.customerUID	= Long.parseLong(oEl.getTextChildren("customerUID")[0]);
+		response.customerUID	= Long.parseLong(oEl.getTextChildren("customerUniqueId")[0]);
 		
 		return response;
 	}

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/web/client/WebCustomer.java
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/web/client/WebCustomer.java	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/web/client/WebCustomer.java	2006-09-27 17:11:08 UTC (rev 6444)
@@ -79,9 +79,9 @@
 
 
     /**
-     * Gets the loanAmount value for this WebCustomer.
+     * Gets the amount value for this WebCustomer.
      * 
-     * @return loanAmount 
+     * @return amount 
      */
     public double getLoanAmount() {
         return loanAmount;
@@ -89,9 +89,9 @@
 
 
     /**
-     * Sets the loanAmount value for this WebCustomer.
+     * Sets the amount value for this WebCustomer.
      * 
-     * @param loanAmount 
+     * @param amount 
      */
     public void setLoanAmount(double loanAmount) {
         this.loanAmount = loanAmount;
@@ -230,8 +230,8 @@
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("loanAmount");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://localhost/loanbroker", "loanAmount"));
+        elemField.setFieldName("amount");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://localhost/loanbroker", "amount"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "double"));
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-csv-0.1.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-csv-0.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-templating-0.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/milyn-smooks-templating-0.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/opencsv-1.6.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/opencsv-1.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/lib/xstream-1.1.3.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/log4j.xml	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/log4j.xml	2006-09-27 17:11:08 UTC (rev 6444)
@@ -64,7 +64,6 @@
    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
       <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
       <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
 
       <layout class="org.apache.log4j.PatternLayout">
          <!-- The default pattern: Date Priority [Category] Message\n -->
@@ -182,7 +181,7 @@
    <!-- Limit JBoss categories
    <category name="org.jboss">
       <priority value="INFO"/>
-   </category>
+   </category><
    -->
 
    <!-- Limit the JSR77 categories -->
@@ -198,6 +197,19 @@
       <priority value="INFO"/>
    </category>
 
+   <category name="org.milyn">
+      <priority value="INFO"/>
+   </category>
+   <category name="org.milyn.delivery.SmooksXML">
+      <priority value="DEBUG"/>
+   </category>
+   <category name="org.milyn.delivery.serialize.Serializer">
+      <priority value="DEBUG"/>
+   </category>
+   <category name="org.milyn.cdr.XMLConfigDigester">
+      <priority value="INFO"/>
+   </category>
+
    <!-- Limit JBossWS webservice category
    <category name="org.jboss.ws">
       <priority value="DEBUG"/>

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/from__loanbroker.cdrl
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/from__loanbroker.cdrl	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/from__loanbroker.cdrl	2006-09-27 17:11:08 UTC (rev 6444)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+<!DOCTYPE smooks-resource-list PUBLIC '-//MILYN//DTD SMOOKS 1.0//EN' 'http://milyn.org/dtd/smooksres-list-1.0.dtd'>
+
+<smooks-resource-list>
+
+	<!-- 
+		Bank Quotes from the loan broker are always in CSV format.  Need to enable a CSV to SAX parser
+		to enable transformation of these messages.
+		
+		See: http://milyn.codehaus.org/javadoc/smooks-cartridges/csv/org/milyn/csv/CSVParser.html
+	-->
+	<smooks-resource useragent="type:BankQuote AND from:LoanBroker" selector="org.xml.sax.driver" path="org.milyn.csv.CSVParser" >
+		<param name="fields" type="string-list">ssn,creditScore,creditHistoryLen,amount,term,customerUniqueId</param>
+	</smooks-resource>
+
+</smooks-resource-list>
\ No newline at end of file

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/smooks-cdr.lst
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/smooks-cdr.lst	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/smooks-cdr.lst	2006-09-27 17:11:08 UTC (rev 6444)
@@ -0,0 +1,31 @@
+#################################################################################################################################################
+#
+# OVERVIEW:
+# =========
+# This is the Smooks configuration file "list file" i.e. it lists all the Smooks resource configuration files.  One should think of these
+# configuration files as being the Smooks configuration database.  These configurations may/will eventually be maintained in a database
+# with a graphical UI to aid comprehension.
+#
+# THINGS TO NOTE:
+# ===============
+# 1. 	Don't try to apply any significance to the fact that there are multiple .cdrl files.  This does not mean they are
+#		separate transformations.  All these files are loaded by Smooks to make up a "database" of transformation
+#		resource configurations.  Smooks will dynamically select the resource configurations that apply in a given situation
+#		based on the profiles associated with the requested transformation "useragent" e.g. message type, message producer,
+#		message consumer.
+#
+# 2. 	The .cdrl list entries in this file are resource references on the *classpath* i.e. they're not filesystem paths.
+#		These .cdrl files should all be located in the "transform" folder.
+#
+#################################################################################################################################################
+
+#-------------------------------------------------------------------------------
+# Message transformation resource definitions
+#-------------------------------------------------------------------------------
+/from__loanbroker.cdrl
+/to____jmsbank.cdrl
+
+#-------------------------------------------------------------------------------
+# Common transformation support resource definitions.
+#-------------------------------------------------------------------------------
+/org/milyn/templating/templating-cdu-creators-0.1.cdrl

Added: labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/to____jmsbank.cdrl
===================================================================
--- labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/to____jmsbank.cdrl	2006-09-27 16:46:49 UTC (rev 6443)
+++ labs/jbossesb/trunk/product/docs/samples/trailblazer/bankloanbrokerdemo/transform/smooks/to____jmsbank.cdrl	2006-09-27 17:11:08 UTC (rev 6444)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<!DOCTYPE smooks-resource-list PUBLIC '-//MILYN//DTD SMOOKS 1.0//EN' 'http://milyn.org/dtd/smooksres-list-1.0.dtd'>
+
+<smooks-resource-list>
+
+	<!-- 
+		1.	Bank Quotes from the loan broker are always XML'ified CSV records.
+			See from__loanbroker.cdrl
+		2.	The JMSBank needs this data as XML, but the XML produced by CSVParser needs the following
+			modifications:
+			i)	A general restructuring of the <csv-record> elements to fit the format requirements of the JMSBank.
+				(See http://milyn.codehaus.org/javadoc/smooks-cartridges/templating/org/milyn/templating/xslt/XslContentDeliveryUnitCreator.html)
+			ii)	Remove the root <csv-set>.  We know that there's only on CVS record in this set and the JMSBank
+				expects the root to be "org.jboss.soa.esb.samples.loanbroker.banks.BankQuoteRequest".
+				(See http://milyn.codehaus.org/javadoc/smooks-cartridges/misc/org/milyn/cdres/trans/RemoveElementTU.html)
+	-->
+	<smooks-resource useragent="type:BankQuote AND from:LoanBroker AND to:JMSBank" selector="csv-record">
+		<param name="restype">xsl</param>
+		<param name="resdata">
+			<![CDATA[
+				<org.jboss.soa.esb.samples.loanbroker.banks.BankQuoteRequest>
+					<ssn><xsl:value-of select="ssn"/></ssn>
+					<creditScore><xsl:value-of select="creditScore"/></creditScore>
+					<historyLength><xsl:value-of select="creditHistoryLen"/></historyLength>
+					<loanAmount><xsl:value-of select="amount"/></loanAmount>
+					<loanTerm><xsl:value-of select="term"/></loanTerm>
+					<customerUID><xsl:value-of select="customerUniqueId"/></customerUID>
+				</org.jboss.soa.esb.samples.loanbroker.banks.BankQuoteRequest>
+			]]>
+		</param>
+	</smooks-resource>
+	<smooks-resource useragent="type:BankQuote AND from:LoanBroker AND to:JMSBank" selector="csv-set" path="org.milyn.cdres.trans.RemoveElementTU">
+		<param name="keepChildContent">true</param>
+	</smooks-resource>
+
+</smooks-resource-list>
\ No newline at end of file

Deleted: labs/jbossesb/trunk/product/lib/ext/dtdparser-1.21.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.7.2-SNAPSHOT.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.8-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-core-0.8-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-javabean-0.1.1.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-misc-0.1.1.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-misc-0.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-misc-0.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/lib/ext/milyn-smooks-templating-0.2.jar
===================================================================
(Binary files differ)

Added: labs/jbossesb/trunk/product/lib/ext/xalan-2.7.0.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/xalan-2.7.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


