You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2008/06/11 23:53:22 UTC
svn commit: r666860 - in
/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script: ./
src/main/java/org/apache/servicemix/script/
src/test/java/org/apache/servicemix/script/ src/test/resources/
Author: lhein
Date: Wed Jun 11 14:53:22 2008
New Revision: 666860
URL: http://svn.apache.org/viewvc?rev=666860&view=rev
Log:
- reverted my previous change...the JSR223 endpoint will be extracted to another SE because of compatibility issues with spring dynamic languages
Removed:
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/DefaultScriptingMarshaler.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptEndpoint.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptEndpointType.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptingMarshalerSupport.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/GroovyExchangeProcessorJSR223.groovy
Modified:
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/pom.xml
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptComponent.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptExchangeProcessorEndpoint.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/spring.xml
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/pom.xml?rev=666860&r1=666859&r2=666860&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/pom.xml Wed Jun 11 14:53:22 2008
@@ -45,23 +45,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.livetribe</groupId>
- <artifactId>livetribe-jsr223</artifactId>
- <version>2.0.3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.script</groupId>
- <artifactId>groovy-engine</artifactId>
- <version>20070112</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
@@ -117,7 +100,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<version>2.2.3</version>
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptComponent.java?rev=666860&r1=666859&r2=666860&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptComponent.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptComponent.java Wed Jun 11 14:53:22 2008
@@ -26,17 +26,17 @@
*/
public class ScriptComponent extends DefaultComponent {
- private ScriptEndpointType[] endpoints;
+ private ScriptExchangeProcessorEndpoint[] endpoints;
protected Class[] getEndpointClasses() {
- return new Class[] {ScriptExchangeProcessorEndpoint.class, ScriptEndpoint.class };
+ return new Class[] {ScriptExchangeProcessorEndpoint.class };
}
- public ScriptEndpointType[] getEndpoints() {
+ public ScriptExchangeProcessorEndpoint[] getEndpoints() {
return endpoints;
}
- public void setEndpoints(ScriptEndpointType[] endpoints) {
+ public void setEndpoints(ScriptExchangeProcessorEndpoint[] endpoints) {
this.endpoints = endpoints;
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptExchangeProcessorEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptExchangeProcessorEndpoint.java?rev=666860&r1=666859&r2=666860&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptExchangeProcessorEndpoint.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/main/java/org/apache/servicemix/script/ScriptExchangeProcessorEndpoint.java Wed Jun 11 14:53:22 2008
@@ -29,7 +29,7 @@
/**
* @org.apache.xbean.XBean element="exchangeProcessor"
*/
-public class ScriptExchangeProcessorEndpoint extends ProviderEndpoint implements ScriptEndpointType {
+public class ScriptExchangeProcessorEndpoint extends ProviderEndpoint {
private ExchangeProcessor implementation;
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java?rev=666860&r1=666859&r2=666860&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java Wed Jun 11 14:53:22 2008
@@ -89,25 +89,6 @@
client.done(me);
}
- public void testGroovyJSR223() throws Exception {
- DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
- InOut me = client.createInOutExchange();
- me.setService(new QName("urn:test", "groovy-jsr223"));
- me.getInMessage().setContent(new StringSource("<hello>jsr-223</hello>"));
- client.sendSync(me);
- if (me.getStatus() == ExchangeStatus.ERROR) {
- if (me.getError() != null) {
- throw me.getError();
- } else {
- fail("Received ERROR status");
- }
- } else if (me.getFault() != null) {
- fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
- }
- log.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
- client.done(me);
- }
-
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext("spring.xml");
}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/spring.xml?rev=666860&r1=666859&r2=666860&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/spring.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/src/test/resources/spring.xml Wed Jun 11 14:53:22 2008
@@ -20,7 +20,6 @@
<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
xmlns:script="http://org.apache.servicemix/script/1.0"
xmlns:lang="http://www.springframework.org/schema/lang"
- xmlns:util="http://www.springframework.org/schema/util"
xmlns:test="urn:test">
<sm:container id="jbi" embedded="true" createMBeanServer="false">
@@ -66,14 +65,7 @@
</property>
<property name="implementation" ref="jrubyExchangeProcessor" />
</script:exchangeProcessor>
-
- <!-- Groovy JSR-223 Endpoint -->
- <script:jsr223
- service="test:groovy-jsr223" endpoint="endpoint"
- script="classpath:GroovyExchangeProcessorJSR223.groovy"
- bindings="#customBindings">
- </script:jsr223>
-
+
</sm:endpoints>
</sm:container>
@@ -99,8 +91,4 @@
<lang:property name="exchangeHelper" ref="jrubyExchangeHelper" />
</lang:jruby>
- <util:map id="customBindings">
- <entry key="answer" value="JSR-223 seems to work fine..." />
- </util:map>
-
</beans>