You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/12/29 12:14:40 UTC
svn commit: r490980 - in
/incubator/servicemix/trunk/common/servicemix-components/src:
main/java/org/apache/servicemix/components/script/
test/resources/org/apache/servicemix/components/groovy/
Author: gnodet
Date: Fri Dec 29 03:14:34 2006
New Revision: 490980
URL: http://svn.apache.org/viewvc?view=rev&rev=490980
Log:
SM-781: Bug in ScriptComponent when using "script" attribute
Added:
incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/script.groovy
Modified:
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml
Modified: incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java?view=diff&rev=490980&r1=490979&r2=490980
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java Fri Dec 29 03:14:34 2006
@@ -293,8 +293,8 @@
}
protected void checkScriptTextAvailable() throws JBIException {
- if (scriptText == null) {
- throw new JBIException("If no 'compiledScript' is specified you must specify the 'scriptText'");
+ if (scriptText == null && script == null) {
+ throw new JBIException("If no 'compiledScript' is specified you must specify the 'scriptText' or 'script'");
}
}
}
Modified: incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml?view=diff&rev=490980&r1=490979&r2=490980
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/groovy-chain.xml Fri Dec 29 03:14:34 2006
@@ -30,32 +30,7 @@
<sm:activationSpec componentName="receiver" service="foo:receiver">
<sm:component>
<bean class="org.apache.servicemix.components.groovy.GroovyComponent">
- <property name="scriptText">
- <value><![CDATA[
-
-println "Called with inbound message $inMessage"
-
-// lets output some message properties
-def me1 = deliveryChannel.createExchangeFactoryForService(new javax.xml.namespace.QName("http://servicemix.org/cheese/", "service1")).createInOutExchange()
-def in1 = me1.createMessage()
-in1.bodyText = inMessage.bodyText
-me1.setMessage(in1, "in")
-deliveryChannel.sendSync(me1)
-println "Received: " + me1.getMessage("out").bodyText
-
-// lets output some message properties
-def me2 = deliveryChannel.createExchangeFactoryForService(new javax.xml.namespace.QName("http://servicemix.org/cheese/", "service2")).createInOutExchange()
-def in2 = me2.createMessage()
-in2.bodyText = me1.getMessage("out").bodyText
-me2.setMessage(in2, "in")
-deliveryChannel.sendSync(me2)
-println "Received: " + me2.getMessage("out").bodyText
-
-// lets output some non-xml body
-outMessage.bodyText = me2.getMessage("out").bodyText
-
- ]]></value>
- </property>
+ <property name="script" value="classpath:/org/apache/servicemix/components/groovy/script.groovy" />
</bean>
</sm:component>
</sm:activationSpec>
Added: incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/script.groovy
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/script.groovy?view=auto&rev=490980
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/script.groovy (added)
+++ incubator/servicemix/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/groovy/script.groovy Fri Dec 29 03:14:34 2006
@@ -0,0 +1,21 @@
+println "Called with inbound message $inMessage"
+
+// lets output some message properties
+def me1 = deliveryChannel.createExchangeFactoryForService(new javax.xml.namespace.QName("http://servicemix.org/cheese/", "service1")).createInOutExchange()
+def in1 = me1.createMessage()
+in1.bodyText = inMessage.bodyText
+me1.setMessage(in1, "in")
+deliveryChannel.sendSync(me1)
+println "Received: " + me1.getMessage("out").bodyText
+
+// lets output some message properties
+def me2 = deliveryChannel.createExchangeFactoryForService(new javax.xml.namespace.QName("http://servicemix.org/cheese/", "service2")).createInOutExchange()
+def in2 = me2.createMessage()
+in2.bodyText = me1.getMessage("out").bodyText
+me2.setMessage(in2, "in")
+deliveryChannel.sendSync(me2)
+println "Received: " + me2.getMessage("out").bodyText
+
+// lets output some non-xml body
+outMessage.bodyText = me2.getMessage("out").bodyText
+