[jboss-svn-commits] JBL Code SVN: r25309 - in labs/jbossesb/branches/JBESB_4_4_GA_FP: product/samples/quickstarts/transform_CSV2XML and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 17 11:47:07 EST 2009
Author: tfennelly
Date: 2009-02-17 11:47:07 -0500 (Tue, 17 Feb 2009)
New Revision: 25309
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbm-queue-service.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbmq-queue-service.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks-base-configs/
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks-service.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks.esb.xml
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/META-INF/deployment.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/qa/quickstarts/resources/transformedmessageDateManipulation.log
Log:
https://jira.jboss.org/jira/browse/JBESB-2422
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -12,7 +12,7 @@
<dependency org="commons-lang" name="commons-lang" rev="2.1"/>
<!-- dependency org="commons-net" name="commons-net" rev="2.0.0-652071"/ -->
<!-- dependency org="org.apache.commons" name="not-yet-commons-ssl" rev="0.3.7"/ -->
- <dependency org="groovy" name="groovy-all" rev="1.0"/>
+ <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.0"/>
<dependency org="com.h2database" name="h2" rev="1.0.68"/>
<dependency org="hibernate" name="hibernate3" rev="3.2.4.SP1"/>
<dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/SampleOrder.csv 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,3 +1,3 @@
1,Wed Nov 15 13:45:28 EST 2006,0,59.97,64.92,4.95,user1,Harry,Fletcher,SD,1,1,364,The 40-Year-Old Virgin,29.98,2,1,299,Pulp Fiction,29.99
2,Wed Nov 15 13:45:28 EST 2007,0,60.00,64.92,4.95,user2,Kalle,Anka,SD,1,1,364,Fletch,29.98,2,1,299,Fletch Lives,29.99
-3,Wed Nov 15 13:45:28 EST 2007,0,60.00,64.92,4.95,user3,Donald,Duck,SD,1,1,364,The Goonies,29.98,2,1,4,Happy Gilmor,29.99
+3,Wed Nov 15 13:45:28 EST 2007,0,60.00,64.92,4.95,user3,Donald,Duck,SD,1,1,364,The Goonies,29.98,2,1,4,Happy Gilmor,29.99
\ No newline at end of file
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,37 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.1.xsd">
<profiles>
<profile base-profile="source-csv" />
<profile base-profile="canonical-xml" />
</profiles>
- <resource-config target-profile="source-csv" selector="org.xml.sax.driver">
- <resource>org.milyn.csv.CSVParser</resource>
- <param name="fields" type="string-list">
- orderId,
- orderDate,
- statusCode,
- netAmount,
- totalAmount,
- tax,
- userName,
- firstName,
- lastName,
- state,
- orderLine1Position,
- orderLine1Quantity,
- orderLine1ProductId,
- orderLine1ProductTitle,
- orderLine1ProductPrice,
- orderLine2Position,
- orderLine2Quantity,
- orderLine2ProductId,
- orderLine2ProductTitle,
- orderLine2ProductPrice
- </param>
- </resource-config>
-
+ <csv:reader targetProfile="source-csv" fields="orderId,orderDate,statusCode,netAmount,totalAmount,tax,userName,firstName,lastName,state,orderLine1Position,orderLine1Quantity,orderLine1ProductId,orderLine1ProductTitle,orderLine1ProductPrice,orderLine2Position,orderLine2Quantity,orderLine2ProductId,orderLine2ProductTitle,orderLine2ProductPrice" />
+
<resource-config target-profile="canonical-xml" selector="csv-set">
<resource type="xsl">
<![CDATA[
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/smooks-res.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,46 +1,43 @@
<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
+ xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"
+ xmlns:g="http://www.milyn.org/xsd/smooks/groovy-1.1.xsd">
<!--
- Create an instance of the OrderDate bean and bind it to the beanId "orderDate". This ID is
- used later in the XSLT to refer to this bean.
+ Using Java Binding: Capture and decode the date from the order, storing the decoded
+ date value in a simple HashMap.
-->
- <resource-config selector="Order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderDate</param>
- <param name="VisitPhase">ASSEMBLY</param>
- <param name="beanClass">org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test.OrderDate</param>
- <param name="bindings">
- <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
- </param>
- </resource-config>
-
- <resource-config selector="decoder:LongDate">
- <resource>org.milyn.javabean.decoders.DateDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss yyyy</param>
- </resource-config>
+ <jb:bindings beanId="order" class="java.util.HashMap" createOnElement="$document">
+ <jb:value property="orderDate" data="Order/@orderDate" decoder="Date">
+ <jb:decodeParam name="format">EEE MMM dd HH:mm:ss yyyy</jb:decodeParam>
+ </jb:value>
+ </jb:bindings>
<!--
- Generate the new "OrderDate" element from the date data in the orderDate bean and insert the result before
- the OrderLines element.
+ Using FreeMarker Templating: Generate the new "OrderDate" element from decoded date captured in
+ the binding config above.
-->
- <resource-config selector="OrderLines">
- <resource type="xsl"><![CDATA[<OrderDate>
- <day><smooks-bean:select ognl="orderDate.day"/></day>
- <time><smooks-bean:select ognl="orderDate.time"/></time>
- <month><smooks-bean:select ognl="orderDate.month"/></month>
- <year><smooks-bean:select ognl="orderDate.year"/></year>
- </OrderDate>]]></resource>
- <param name="is-xslt-templatelet">true</param>
- <param name="action">insertbefore</param>
- </resource-config>
-
+ <ftl:freemarker applyOnElement="OrderLines">
+ <ftl:template><![CDATA[ <OrderDate>
+ <day>${order.orderDate?string("dd")}</day>
+ <time>${order.orderDate?string("HH:mm")}</time>
+ <month>${order.orderDate?string("MM")}</month>
+ <year>${order.orderDate?string("yy")}</year>
+ </OrderDate>]]></ftl:template>
+ <ftl:use>
+ <ftl:inline directive="insertbefore" />
+ </ftl:use>
+ </ftl:freemarker>
+
<!--
- Remove the orderDate attribute from the Order element - it's now in the message as an OrderDate element.
+ Using Groovy Scripting: Remove the orderDate attribute from the Order element - it's
+ now in the message as an OrderDate element.
-->
- <resource-config selector="Order">
- <resource>org.milyn.cdres.trans.RemoveAttributeTU</resource>
- <param name="attributeName">orderDate</param>
- </resource-config>
+ <g:groovy executeOnElement="Order" executeBefore="false">
+ <g:script>
+ element.removeAttribute("orderDate");
+ </g:script>
+ </g:groovy>
</smooks-resource-list>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2XML_date_manipulation/src/org/jboss/soa/esb/samples/quickstart/transformxml2xmldatemanipulation/test/OrderDate.java 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Sample bean for orderDate manipulation Using Java. This type of thing is a
- * real pain in XSLT!!
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class OrderDate {
-
- private Date orderDate;
-
- /**
- * Formatters for encoding the date in the transformation.
- * N.B. These are not thread safe.
- *
- * TimeZone information has been removed to allow for consistent testing.
- */
- private static SimpleDateFormat dayFormat = new SimpleDateFormat("dd");
- private static SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
- private static SimpleDateFormat monthFormat = new SimpleDateFormat("MM");
- private static SimpleDateFormat yearFormat = new SimpleDateFormat("yy");
-
- public void setOrderDate(Date orderDate) {
- this.orderDate = orderDate;
- }
- public Date getOrderDate() {
- return orderDate;
- }
- public String getDay() {
- return dayFormat.format(orderDate.getTime());
- }
- public String getTime() {
- return timeFormat.format(orderDate.getTime());
- }
- public String getMonth() {
- return monthFormat.format(orderDate.getTime());
- }
- public String getYear() {
- return yearFormat.format(orderDate.getTime());
- }
-}
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksService.java 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.jboss.internal.soa.esb.util.PropertiesHelper;
-import org.jboss.internal.soa.esb.util.XMLHelper;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
-import org.apache.log4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-/**
- * SmooksService implementation.
- * <p/>
- * Initialises the "global" Smooks instance.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksService extends ServiceMBeanSupport implements SmooksServiceMBean {
-
- private static Logger logger = Logger.getLogger(SmooksService.class);
- private static SmooksInstanceManager globalSmooksInstanceManager;
- private static final String CONSOLE_URL = "console.url";
-
- private static final String SMOOKS_PROPERTY_FILE = "smooks.esb.properties";
- private static final String SMOOKS_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
-
- /**
- * The smooks default property file.
- */
- private String propertyFile ;
-
- protected void startService() throws Exception {
- super.startService();
-
- if (propertyFile != null) {
- final File baseFile = new File(propertyFile) ;
- final InputStream xmlPropertyIS ;
- if (!baseFile.isAbsolute()) {
- final URL resourceURL = Thread.currentThread().getContextClassLoader().getResource(propertyFile) ;
- xmlPropertyIS = resourceURL.openStream() ;
- } else {
- xmlPropertyIS = new FileInputStream(baseFile) ;
- }
- final byte[] propertyFileContents ;
- try {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream() ;
- XMLHelper.replaceSystemProperties(XMLHelper.getXMLStreamReader(xmlPropertyIS),
- XMLHelper.getXMLStreamWriter(baos)) ;
- propertyFileContents = baos.toByteArray() ;
- } finally {
- xmlPropertyIS.close() ;
- }
-
- final ServerConfig serverConfig = ServerConfigLocator.locate() ;
- final File dataDir = serverConfig.getServerDataDir() ;
- final File smooksPropertyFile = new File(dataDir, SMOOKS_PROPERTY_FILE) ;
-
- final ByteArrayInputStream bais = new ByteArrayInputStream(propertyFileContents) ;
- final FileOutputStream smooksPropertyOS = new FileOutputStream(smooksPropertyFile) ;
- try {
- PropertiesHelper.translateXMLToText(bais, smooksPropertyOS, SMOOKS_PROPERTY_FILE_COMMENTS) ;
- } finally {
- smooksPropertyOS.close() ;
- }
- SmooksConfiguration.setDefaultConfiguration(smooksPropertyFile.getAbsolutePath()) ;
- }
-
- Properties smooksEsbConfig = new SmooksConfiguration();
- String resourceConfig = smooksEsbConfig.getProperty(CONSOLE_URL);
-
- if(resourceConfig != null) {
- globalSmooksInstanceManager = new SmooksInstanceManager("Console", resourceConfig);
- logger.info("Centralized Smooks Instance (Console Based) started.");
- } else {
- logger.info("Centralized Smooks Instance (Console Based) instance not started. See the '" + CONSOLE_URL + "' property in '" + SmooksConfiguration.SMOOKS_ESB_PROPERTIES + "'");
- }
- }
-
- protected void stopService() throws Exception {
- if(globalSmooksInstanceManager != null) {
- globalSmooksInstanceManager.close();
- logger.info("Centralized Smooks Instance (Console Based) stopped.");
- }
-
- super.stopService();
- }
-
- public static SmooksInstanceManager getGlobalSmooksInstanceManager() {
- return globalSmooksInstanceManager;
- }
-
- /**
- * Get the property file.
- * @return The name of the property file being used.
- */
- public String getPropertyFile() {
- return propertyFile ;
- }
-
- /**
- * Set the property file.
- * @param propertyFile The name of the property file being used.
- */
- public void setPropertyFile(final String propertyFile) {
- this.propertyFile = propertyFile ;
- }
-}
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksServiceMBean.java 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006, JBoss Inc.
- */
-package org.jboss.soa.esb.actions.converters;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * Smooks Service MBean.
- * <p/>
- * Initialization MBean.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface SmooksServiceMBean extends ServiceMBean {
- /**
- * Get the property file.
- * @return The name of the property file being used.
- */
- public String getPropertyFile() ;
- /**
- * Set the property file.
- * @param propertyFile The name of the property file being used.
- */
- public void setPropertyFile(final String propertyFile) ;
-}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2009-02-17 16:47:07 UTC (rev 25309)
@@ -240,12 +240,10 @@
// we have an error!
if(resourceConfig != null) {
initialiseLocalSmooksInstanceManager(resourceConfig);
- } else {
- smooksInstanceManager = SmooksService.getGlobalSmooksInstanceManager();
}
if(smooksInstanceManager == null) {
- throw new ActionLifecycleException("Invalid " + getClass().getSimpleName() + " action configuration. No 'resource-config' specified on the action and no centralised console config available (see smooks.esb.properties).");
+ throw new ActionLifecycleException("Invalid " + getClass().getSimpleName() + " action configuration. No 'resource-config' specified on the action.");
}
logger.info("Smooks configurations are now loaded.");
@@ -258,9 +256,7 @@
}
public void destroy() throws ActionLifecycleException {
- if(smooksInstanceManager != SmooksService.getGlobalSmooksInstanceManager()) {
- smooksInstanceManager.close();
- }
+ smooksInstanceManager.close();
}
/* (non-Javadoc)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/META-INF/deployment.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/META-INF/deployment.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbossesb-deployment>
<depends>jboss.esb:deployment=jbossesb.esb</depends>
- <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
</jbossesb-deployment>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbm-queue-service.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbm-queue-service.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-</server>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbmq-queue-service.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/jbmq-queue-service.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
-</server>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks-service.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks-service.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
- <mbean code="org.jboss.soa.esb.actions.converters.SmooksService"
- name="jboss.esb:service=SmooksService">
- <attribute name="PropertyFile">smooks.esb.xml</attribute>
-
- <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
- </mbean>
-</service>
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks.esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks.esb.xml 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/resources/smooks.esb.xml 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Do not add the DOCTYPE to this file otherwise transformation will not
- work when offline.
- -->
-<properties>
- <!--
- Configure in the following property to enable config loading
- from the Transformation Admin Console.
- -->
- <!--
- <entry key="console.url">http://${jboss.esb.bind.address}:8080/jboss-esb-console/transform/smooks-config.jsp</entry>
- -->
-
- <!--
- Base configurations. Added for all non-console based Smooks instances.
- Value is comma-separated-list. All resources must be in the
- "smooks-base-configs" folder of this .esb.
- -->
- <entry key="smooks.base.configs">creators.xml</entry>
-
- <!--
- Context properties.
-
- Defaults to JBoss AS on ${jboss.esb.bind.address}.
- -->
- <entry key="java.naming.provider.url">${jboss.esb.bind.address}:1099</entry>
- <entry key="java.naming.factory.initial">org.jnp.interfaces.NamingContextFactory</entry>
- <!--
- <entry key="java.naming.factory.url.pkgs"></entry>
- -->
-
- <!--
- JMS properties.
-
- Provider defaults to JBoss MQ.
- -->
- <entry key="javax.jms.ConnectionFactory">ConnectionFactory</entry>
- <entry key="update.notification.topic">topic/org.jboss.soa.esb.transformation.Update</entry>
-</properties>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/qa/quickstarts/resources/transformedmessageDateManipulation.log
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/qa/quickstarts/resources/transformedmessageDateManipulation.log 2009-02-17 15:46:17 UTC (rev 25308)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/qa/quickstarts/resources/transformedmessageDateManipulation.log 2009-02-17 16:47:07 UTC (rev 25309)
@@ -1,17 +1,16 @@
<Order netAmount="59.97" orderId="1" statusCode="0" tax="4.95" totalAmount="64.92">
- <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"/>
- <OrderDate>
- <day>15</day>
- <time>13:45</time>
- <month>11</month>
- <year>06</year>
- </OrderDate>
- <OrderLines>
- <OrderLine position="1" quantity="1">
- <Product price="29.98" productId="364" title="The 40-Year-Old Virgin "/>
- </OrderLine>
- <OrderLine position="2" quantity="1">
- <Product price="29.99" productId="299" title="Pulp Fiction"/>
- </OrderLine>
- </OrderLines>
-</Order>
+ <Customer firstName="Harry" lastName="Fletcher" state="SD" userName="user1"></Customer>
+ <OrderDate>
+ <day>15</day>
+ <time>13:45</time>
+ <month>11</month>
+ <year>06</year>
+ </OrderDate><OrderLines>
+ <OrderLine position="1" quantity="1">
+ <Product price="29.98" productId="364" title="The 40-Year-Old Virgin "></Product>
+ </OrderLine>
+ <OrderLine position="2" quantity="1">
+ <Product price="29.99" productId="299" title="Pulp Fiction"></Product>
+ </OrderLine>
+ </OrderLines>
+</Order>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list