[jboss-svn-commits] JBL Code SVN: r36989 - in labs/jbossesb/trunk/product: services and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 11 05:17:45 EDT 2011
Author: tfennelly
Date: 2011-05-11 05:17:45 -0400 (Wed, 11 May 2011)
New Revision: 36989
Modified:
labs/jbossesb/trunk/product/.classpath
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/ivysettings.xml
labs/jbossesb/trunk/product/services/base-project-build.xml
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/SmooksAction.java
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/splitting/AbstractStreamSplitter.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksHandler.java
Log:
https://issues.jboss.org/browse/JBESB-3588
Upgrade Smooks to 1.4
Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/.classpath 2011-05-11 09:17:45 UTC (rev 36989)
@@ -46,14 +46,12 @@
<classpathentry kind="lib" path="build/lib/commons-lang-2.3.jar"/>
<classpathentry kind="lib" path="build/lib/commons-logging-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/lib/freemarker-2.3.11.jar"/>
<classpathentry kind="lib" path="build/lib/groovy-all-1.5.4.jar"/>
<classpathentry kind="lib" path="build/lib/h2-1.2.124.jar"/>
<classpathentry kind="lib" path="build/lib/hibernate3-3.2.4.SP1.jar"/>
<classpathentry kind="lib" path="build/lib/javassist-3.6.0.GA.jar"/>
<classpathentry kind="lib" path="build/lib/jaxb-api-2.1.jar"/>
<classpathentry kind="lib" path="build/lib/jaxb-xjc-2.1.4.jar"/>
- <classpathentry kind="lib" path="build/lib/jaxen-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-security-spi-2.0.3.SP1.jar"/>
<classpathentry kind="lib" path="build/lib/jbosssx-2.0.3.SP1.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-4.2.3.GA.jar"/>
@@ -91,31 +89,7 @@
<classpathentry kind="lib" path="build/lib/juddi-core-3.0.4.jar"/>
<classpathentry kind="lib" path="build/lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="build/lib/mail-1.4.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-commons-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-edisax-parser-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-magger-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-scribe-hibernate-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-scribe-ibatis-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-scribe-jpa-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-calc-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-core-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-css-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-csv-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-edi-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-ejc-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-javabean-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-json-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-misc-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-persistence-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-routing-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-rules-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-scripting-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-servlet-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-templating-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-validation-1.2.5.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-tinak-1.2.5.jar"/>
<classpathentry kind="lib" path="build/lib/mina-core-1.1.7.jar"/>
- <classpathentry kind="lib" path="build/lib/mvel2-2.0.12.jar"/>
<classpathentry kind="lib" path="build/lib/ognl-2.6.9.jar"/>
<classpathentry kind="lib" path="build/lib/picketlink-fed-api-1.0.3.final.jar"/>
<classpathentry kind="lib" path="build/lib/picketlink-fed-core-1.0.3.final.jar"/>
@@ -178,18 +152,6 @@
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-1.7.1.jar"/>
<classpathentry kind="lib" path="services/soapui-client/src/lib/soapui-xmlbeans-1.7.jar"/>
<classpathentry kind="lib" path="services/soapui-client/src/lib/soap-xmlbeans-1.2.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.aop-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.asm-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.aspects-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.beans-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.context-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.context.support-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.core-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.expression-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.jms-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.orm-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.oxm-3.0.2.RELEASE.jar"/>
- <classpathentry kind="lib" path="services/spring/build/spring.esb/org.springframework.test-3.0.2.RELEASE.jar"/>
<classpathentry kind="lib" path="services/spring/lib/ext/aopalliance-1.0.jar"/>
<classpathentry kind="lib" path="services/spring/lib/ext/ibatis-sqlmap-2.3.4.726.jar"/>
<classpathentry kind="lib" path="services/spring/lib/ext/snowdrop/snowdrop-deployers-1.1.0.GA.jar"/>
@@ -199,5 +161,9 @@
<classpathentry kind="var" path="ESB_ROOT/testlib/junit-4.1.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockejb.jar"/>
<classpathentry kind="var" path="ESB_ROOT/testlib/mockito-all-1.8.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/milyn-smooks-all-1.4.jar"/>
+ <classpathentry kind="lib" path="build/lib/mvel2-2.0.17.jar"/>
+ <classpathentry kind="lib" path="build/lib/freemarker-2.3.15.jar"/>
+ <classpathentry kind="lib" path="build/lib/jaxen-1.1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/ivy.xml 2011-05-11 09:17:45 UTC (rev 36989)
@@ -69,34 +69,16 @@
<dependency org="beanshell" name="bsh" rev="1.3.0"/>
<!-- Smooks dependencies - smooks.version defined in ivysettings.xml-->
- <dependency org="org.milyn" name="milyn-commons" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-core" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-javabean" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-edisax-parser" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-magger" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-calc" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-css" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-csv" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-edi" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-ejc" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-persistence" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-json" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-misc" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-persistence" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-routing" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-rules" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-scripting" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-servlet" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-templating" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-smooks-validation" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-scribe-hibernate" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-scribe-ibatis" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-scribe-jpa" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-scribe-core" rev="${smooks.version}"/>
- <dependency org="org.milyn" name="milyn-tinak" rev="${smooks.version}"/>
- <dependency org="org.freemarker" name="freemarker" rev="2.3.11"/>
+ <dependency org="org.milyn" name="milyn-smooks-all" rev="${smooks.version}"/>
+ <dependency org="org.freemarker" name="freemarker" rev="2.3.15"/>
<dependency org="org.codehaus.jackson" name="jackson-core-lgpl" rev="1.0.1"/>
- <dependency org="org.mvel" name="mvel2" rev="2.0.12"/>
+ <dependency org="org.mvel" name="mvel2" rev="2.0.17"/>
+ <dependency org="jaxen" name="jaxen" rev="1.1.1">
+ <exclude org="dom4j" module="dom4j"/>
+ <exclude org="xerces" module="xmlParserAPIs"/>
+ <exclude org="xerces" module="xercesImpl"/>
+ <exclude org="xom" module="xom"/>
+ </dependency>
<dependency org="javax.jcr" name="jcr" rev="1.0"/>
Modified: labs/jbossesb/trunk/product/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/ivysettings.xml 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/ivysettings.xml 2011-05-11 09:17:45 UTC (rev 36989)
@@ -1,6 +1,6 @@
<ivysettings>
- <property name="smooks.version" value="1.2.5"/>
+ <property name="smooks.version" value="1.4"/>
<settings defaultResolver="chained"/>
<resolvers>
Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml 2011-05-11 09:17:45 UTC (rev 36989)
@@ -78,8 +78,9 @@
<fileset dir="${esb.main.lib}" includes="juddi-core*.jar"/>
<fileset dir="${esb.main.lib}" includes="log4j*.jar"/>
<fileset dir="${esb.main.lib}" includes="mail*.jar"/>
- <fileset dir="${esb.main.lib}" includes="milyn-commons*.jar"/>
<fileset dir="${esb.main.lib}" includes="milyn-smooks-*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jaxen-*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="freemarker-*.jar"/>
<fileset dir="${esb.main.lib}" includes="mvel*.jar"/>
<fileset dir="${esb.main.lib}" includes="ognl*.jar"/>
<fileset dir="${esb.main.lib}" includes="picketlink*.jar"/>
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2011-05-11 09:17:45 UTC (rev 36989)
@@ -39,7 +39,8 @@
import org.milyn.Smooks;
import org.milyn.SmooksUtil;
import org.milyn.container.ExecutionContext;
-import org.milyn.javabean.repository.BeanRepository;
+import org.milyn.payload.StringResult;
+import org.milyn.payload.StringSource;
import org.milyn.profile.DefaultProfileSet;
import org.milyn.profile.ProfileStore;
import org.milyn.profile.UnknownProfileMemberException;
@@ -296,11 +297,6 @@
if(payload == null) {
logger.warn("Null message payload. Returning message unmodified.");
} else if(payload instanceof String) {
- byte[] messageBytes = null;
- String transformedMessage;
-
- messageBytes = ((String)payload).getBytes("UTF-8");
-
long start = System.currentTimeMillis();
ExecutionContext executionContext;
@@ -314,9 +310,11 @@
} else {
executionContext = smooks.createExecutionContext(messageProfile);
}
- transformedMessage = SmooksUtil.filterAndSerialize(executionContext, new ByteArrayInputStream( messageBytes), smooks);
+
+ StringResult result = new StringResult();
+ smooks.filterSource(executionContext, new StringSource((String) payload), result);
- HashMap beanHash = getBeanHashMap(executionContext);
+ HashMap beanHash = new HashMap(executionContext.getBeanContext().getBeanMap());
if(beanHash != null) {
message.getBody().add(EXTRACTED_BEANS_HASH, beanHash); // Backward compatibility.
} else {
@@ -326,10 +324,10 @@
if(logger.isDebugEnabled()) {
long timeTaken = System.currentTimeMillis() - start;
logger.debug("Transformed message for profile [" + messageProfile + "]. Time taken: "
- + timeTaken + ". Message in:\n[" + payload.toString()+ "]. \nMessage out:\n[" + transformedMessage + "].");
+ + timeTaken + ". Message in:\n[" + payload.toString()+ "]. \nMessage out:\n[" + result.toString() + "].");
}
- setTransformationOutput(message, transformedMessage, executionContext);
+ setTransformationOutput(message, result.toString(), executionContext);
} else {
logger.warn("Only java.lang.String payload types supported. Input message was of type [" + payload.getClass().getName() + "]. Returning message untransformed.");
}
@@ -354,17 +352,20 @@
// Set the transformation Java output. Will be the individual
// java objects directly on the message and (optionally) the map itself...
- Map beanMap = BeanRepository.getInstance(executionContext).getBeanMap();
+ Map beanMap = executionContext.getBeanContext().getBeanMap();
if(beanMap != null) {
Iterator<Map.Entry> beans = beanMap.entrySet().iterator();
while (beans.hasNext()) {
Map.Entry entry = beans.next();
String key = (String) entry.getKey();
+ Object value = entry.getValue();
- if(message.getBody().get(key) != null) {
- logger.debug("Outputting Java object to '" + key + "'. Overwritting existing value.");
+ if(value != null) {
+ if(message.getBody().get(key) != null) {
+ logger.debug("Outputting Java object to '" + key + "'. Overwritting existing value.");
+ }
+ message.getBody().add(key, value);
}
- message.getBody().add(key, entry.getValue());
}
}
@@ -498,11 +499,6 @@
return string.toString();
}
- private HashMap getBeanHashMap(ExecutionContext executionContext) {
- Map beanMap = BeanRepository.getInstance(executionContext).getBeanMap();
- return new HashMap(beanMap);
- }
-
public void processException(final Message message, final Throwable th) {
}
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/SmooksAction.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/SmooksAction.java 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/SmooksAction.java 2011-05-11 09:17:45 UTC (rev 36989)
@@ -37,7 +37,6 @@
import org.milyn.container.plugin.PayloadProcessor;
import org.milyn.container.plugin.ResultType;
import org.milyn.event.report.HtmlReportGenerator;
-import org.apache.commons.lang.ArrayUtils;
import java.io.IOException;
import java.io.Serializable;
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/splitting/AbstractStreamSplitter.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/splitting/AbstractStreamSplitter.java 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/smooks/splitting/AbstractStreamSplitter.java 2011-05-11 09:17:45 UTC (rev 36989)
@@ -65,9 +65,9 @@
ExecutionContext execContext = smooks.createExecutionContext();
execContext.setEventListener(new HtmlReportGenerator(reportPath));
- smooks.filter(streamSource, null, execContext);
+ smooks.filterSource(execContext, streamSource);
} else {
- smooks.filter(streamSource, null);
+ smooks.filterSource(streamSource);
}
}
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java 2011-05-11 09:17:45 UTC (rev 36989)
@@ -271,7 +271,7 @@
execContext.setAttribute(WsdlEndpointTransformer.TARGET_CAT, (targetServiceCat != null?targetServiceCat:""));
execContext.setAttribute(WsdlEndpointTransformer.TARGET_NAME, (targetServiceName != null?targetServiceName:""));
execContext.setAttribute(WsdlEndpointTransformer.TARGET_PROTOCOL, (targetProtocol != null?targetProtocol:""));
- transformer.filter(new StreamSource(new StringReader(wsdl)), new StreamResult(writer), execContext);
+ transformer.filterSource(execContext, new StreamSource(new StringReader(wsdl)), new StreamResult(writer));
return writer.toString().trim();
}
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksHandler.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksHandler.java 2011-05-09 18:32:01 UTC (rev 36988)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksHandler.java 2011-05-11 09:17:45 UTC (rev 36989)
@@ -34,7 +34,6 @@
import org.jboss.soa.esb.smooks.resource.SmooksResource;
import org.milyn.Smooks;
import org.milyn.container.ExecutionContext;
-import org.milyn.javabean.repository.BeanRepository;
import org.milyn.resource.URIResourceLocator;
import org.xml.sax.SAXException;
@@ -119,14 +118,15 @@
ExecutionContext executionContext = smooks.createExecutionContext();
StringWriter transResult = new StringWriter();
+
+ executionContext.getBeanContext().getBeanMap().putAll(this.beansMap);
- BeanRepository.getInstance(executionContext).getBeanMap().putAll(this.beansMap);
StringWriter buffer;
outStream = new ByteArrayOutputStream();
message.writeTo(outStream);
outStream.flush();
inStream = new ByteArrayInputStream(outStream.toByteArray());
- smooks.filter(new StreamSource(inStream), new StreamResult(transResult), executionContext);
+ smooks.filterSource(executionContext, new StreamSource(inStream), new StreamResult(transResult));
inStream.close();
inStream = new ByteArrayInputStream(transResult.toString().getBytes());
SOAPMessage message2 = MessageFactory.newInstance().createMessage(message.getMimeHeaders(), inStream);
More information about the jboss-svn-commits
mailing list