Author: gnodet
Date: Thu Jan 11 12:23:43 2007
New Revision: 495362
URL: http://svn.apache.org/viewvc?view=rev&rev=495362
Log:
SM-783: build fails under Java6
Modified:
incubator/servicemix/trunk/common/servicemix-components/pom.xml
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/groovy/GroovyComponent.java
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
Modified: incubator/servicemix/trunk/common/servicemix-components/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/pom.xml?view=diff&rev=495362&r1=495361&r2=495362
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/common/servicemix-components/pom.xml Thu Jan 11
12:23:43 2007
@@ -163,8 +163,15 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
- <artifactId>jsr-223</artifactId>
+ <groupId>org.livetribe</groupId>
+ <artifactId>livetribe-jsr223</artifactId>
+ <version>2.0.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.script</groupId>
+ <artifactId>groovy-engine</artifactId>
+ <version>20070110</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -247,6 +254,13 @@
<optional>true</optional>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>codehaus-snapshots</id>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ </repositories>
<build>
<plugins>
@@ -284,25 +298,25 @@
<exclude>**/XsltPublisherTest.*</exclude>
<exclude>**/BinaryFileTest.*</exclude>
<exclude>**/FileTest.*</exclude>
- <exclude>**/CounterMonitorComponentTest.*</exclude>
+ <exclude>**/CounterMonitorComponentTest.*</exclude>
<exclude>**/OptionalAxisQueriesTest.*</exclude>
- <exclude>**/JmsBindingTest.*</exclude>
- <exclude>**/WsifTest.*</exclude>
- <exclude>**/HttpSoapAndSaajTest.*</exclude>
- <exclude>**/JmsBindingClusterTest.*</exclude>
-
<exclude>**/JmsBindingUsingEndpointSubscriptionTest.*</exclude>
- <exclude>**/GroovyTransformTest.*</exclude>
- <exclude>**/TransformComponentTest.*</exclude>
+ <exclude>**/JmsBindingTest.*</exclude>
+ <exclude>**/WsifTest.*</exclude>
+ <exclude>**/HttpSoapAndSaajTest.*</exclude>
+ <exclude>**/JmsBindingClusterTest.*</exclude>
+ <exclude>**/JmsBindingUsingEndpointSubscriptionTest.*</exclude>
+ <exclude>**/GroovyTransformTest.*</exclude>
+ <exclude>**/TransformComponentTest.*</exclude>
- <!-- Hangs -->
- <exclude>**/SaajSoapActionTest.*</exclude>
+ <!-- Hangs -->
+ <exclude>**/SaajSoapActionTest.*</exclude>
- <!-- https://issues.apache.org/activemq/browse/SM-529
-->
- <exclude>**/MPSSettingTest.*</exclude>
+ <!-- https://issues.apache.org/activemq/browse/SM-529 -->
+ <exclude>**/MPSSettingTest.*</exclude>
- </excludes>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified:
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/groovy/GroovyComponent.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/groovy/GroovyComponent.java?view=diff&rev=495362&r1=495361&r2=495362
==============================================================================
---
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/groovy/GroovyComponent.java
(original)
+++
incubator/servicemix/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/groovy/GroovyComponent.java
Thu Jan 11 12:23:43 2007
@@ -23,7 +23,7 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import javax.script.Namespace;
+import javax.script.Bindings;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -71,13 +71,13 @@
this.documentBuilderFactory = documentBuilderFactory;
}
- protected void populateNamespace(Namespace namespace, MessageExchange
exchange, NormalizedMessage in, NormalizedMessage out) throws
MessagingException {
+ protected void populateBindings(Bindings bindings, MessageExchange
exchange, NormalizedMessage in, NormalizedMessage out) throws
MessagingException {
try {
- super.populateNamespace(namespace, exchange, in, out);
+ super.populateBindings(bindings, exchange, in, out);
// lets output a builder
DocumentBuilder documentBuilder = getDocumentBuilder();
- namespace.put("builder", new DOMBuilder(documentBuilder));
+ bindings.put("builder", new DOMBuilder(documentBuilder));
}
catch (ParserConfigurationException e) {
throw new MessagingException("Failed to create DOM
DocumentBuilder: " + e, e);
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=495362&r1=495361&r2=495362
==============================================================================
---
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
Thu Jan 11 12:23:43 2007
@@ -27,9 +27,9 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
+import javax.script.Bindings;
import javax.script.Compilable;
import javax.script.CompiledScript;
-import javax.script.Namespace;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
@@ -207,11 +207,11 @@
// Implementation methods
//-------------------------------------------------------------------------
protected boolean transform(MessageExchange exchange, NormalizedMessage
in, NormalizedMessage out) throws Exception {
- Namespace namespace = engine.createNamespace();
+ Bindings bindings = engine.createBindings();
- populateNamespace(namespace, exchange, in, out);
+ populateBindings(bindings, exchange, in, out);
try {
- runScript(namespace);
+ runScript(bindings);
return !isDisableOutput();
}
catch (ScriptException e) {
@@ -221,25 +221,25 @@
}
}
- protected void populateNamespace(Namespace namespace, MessageExchange
exchange, NormalizedMessage in, NormalizedMessage out) throws
MessagingException {
- namespace.put("componentContext", getContext());
- namespace.put("deliveryChannel", getDeliveryChannel());
- namespace.put("exchange", exchange);
- namespace.put("inMessage", in);
- namespace.put("log", getScriptLogger());
- namespace.put("componentNamespace", namespace);
- namespace.put("bindings", bindings);
+ protected void populateBindings(Bindings bindings, MessageExchange
exchange, NormalizedMessage in, NormalizedMessage out) throws
MessagingException {
+ bindings.put("componentContext", getContext());
+ bindings.put("deliveryChannel", getDeliveryChannel());
+ bindings.put("exchange", exchange);
+ bindings.put("inMessage", in);
+ bindings.put("log", getScriptLogger());
+ bindings.put("componentNamespace", bindings);
+ bindings.put("bindings", bindings);
InOnly outExchange = null;
if (isInAndOut(exchange)) {
- namespace.put("outMessage", out);
+ bindings.put("outMessage", out);
}
else if (!isDisableOutput()) {
outExchange = getExchangeFactory().createInOnlyExchange();
if (out instanceof NormalizedMessageImpl) {
- namespace.put("outExchange", ((NormalizedMessageImpl)
out).getExchange());
+ bindings.put("outExchange", ((NormalizedMessageImpl)
out).getExchange());
}
- namespace.put("outMessage", out);
+ bindings.put("outMessage", out);
}
}
@@ -256,17 +256,17 @@
return Logger.getLogger(getClass().getName());
} }
- protected void runScript(Namespace namespace) throws ScriptException {
+ protected void runScript(Bindings bindings) throws ScriptException {
if (compiledScript != null) {
- compiledScript.eval(namespace);
+ compiledScript.eval(bindings);
}
else {
- evaluteScript(namespace);
+ evaluteScript(bindings);
}
}
- protected void evaluteScript(Namespace namespace) throws ScriptException {
- engine.eval(scriptText, namespace);
+ protected void evaluteScript(Bindings bindings) throws ScriptException {
+ engine.eval(scriptText, bindings);
}
protected void compileScript(Compilable compilable) throws JBIException {
