Author: mriou
Date: Thu Apr 5 15:20:38 2007
New Revision: 525981
URL: http://svn.apache.org/viewvc?view=rev&rev=525981
Log:
Alleluia.
Modified:
incubator/ode/trunk/Rakefile
incubator/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
incubator/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml
Modified: incubator/ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=525981&r1=525980&r2=525981
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Thu Apr 5 15:20:38 2007
@@ -58,6 +58,7 @@
QUARTZ = "quartz:quartz:jar:1.5.2"
SAXON = group("saxon", "saxon-xpath", "saxon-dom",
:under=>"net.sf.saxon", :version=>"8.7")
SERVICEMIX = group("servicemix-core", "servicemix-shared",
"servicemix-services", :under=>"org.apache.servicemix",
:version=>"3.1-incubating")
+SPRING = group("spring-beans", "spring-context", "spring-core",
"spring-jmx", :under=>"org.springframework", :version=>"2.0.1")
TRANQL = [ "tranql:tranql-connector:jar:1.1",
"axion:axion:jar:1.0-M3-dev", COMMONS.primitives ]
"regexp:regexp:jar:1.3"
WOODSTOX = "woodstox:wstx-asl:jar:3.0.1"
@@ -70,6 +71,7 @@
:neethi =>"org.apache.ws.commons.neethi:neethi:jar:2.0",
:xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.2"
)
+XBEAN = group("xbean-classloader", "xbean-kernel",
"xbean-server", "xbean-spring", :under=>"org.apache.xbean", :version=>"2.8")
XMLBEANS = "xmlbeans:xbean:jar:2.2.0"
@@ -389,8 +391,15 @@
jbi.merge project("ode:dao-hibernate-db").package(:zip)
jbi.merge project("ode:dao-jpa-ojpa-derby").package(:zip)
end
+
tests.compile.with SERVICEMIX, GERONIMO.kernel, GERONIMO.transaction,
- JAVAX.transaction, JAVAX.connector, JBI, BACKPORT
+ JAVAX.transaction, JAVAX.connector, JBI
+ tests.resources
unzip(project("ode:dao-jpa-ojpa-derby").package(:zip)).into(path_to(:target_dir,
"smixInstallDir/install/ODE"))
+ tests.run.with projects("ode:dao-jpa", "ode:bpel-compiler",
"ode:bpel-api-jca", "ode:jca-ra", "ode:jca-server",
+ "ode:jacob"),
+ BACKPORT, SPRING, XBEAN, GERONIMO.connector,
+ DERBY, TRANQL, OPENJPA, JAVAX.persistence, JAVAX.ejb, JAVAX.stream,
COMMONS.lang, COMMONS.collections,
+ JAXEN, SAXON, QUARTZ, XALAN, XMLBEANS, XSTREAM
end
desc "ODE JCA Resource Archive"
Modified:
incubator/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java?view=diff&rev=525981&r1=525980&r2=525981
==============================================================================
---
incubator/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
(original)
+++
incubator/ode/trunk/jbi/src/test/java/org/apache/ode/jbi/OdeJbiComponentLifeCycleTest.java
Thu Apr 5 15:20:38 2007
@@ -23,6 +23,8 @@
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.framework.ComponentContextImpl;
+import org.apache.servicemix.jbi.framework.ComponentNameSpace;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOut;
@@ -39,7 +41,8 @@
private OdeComponent component;
protected void setUp() throws Exception {
- rootDir = File.createTempFile("smixInstallDir","");
+ rootDir = new File("target/smixInstallDir");
+ rootDir.mkdir();
installDir = new File(rootDir,"install");
installDir.mkdir();
txm = new EmbeddedGeronimoFactory().getTransactionManager();
@@ -48,16 +51,17 @@
container = new JBIContainer();
container.setUseMBeanServer(false);
+ container.setInstallationDirPath(installDir.getAbsolutePath());
+ container.setDeploymentDirPath(odeDir.getAbsolutePath());
+ container.setRootDir(rootDir.getAbsolutePath());
container.setCreateMBeanServer(false);
container.setEmbedded(true);
-
container.setTransactionManager(txm);
container.init();
container.start();
component = new OdeComponent();
-
}
protected void tearDown() throws Exception {
@@ -67,24 +71,22 @@
} catch (Exception ex) {
;//ok ignore
}
-
if (container != null) {
container.shutDown();
container = null;
}
-
component = null;
-
-
}
public void testComponentLifeCycle() throws Exception {
- container.activateComponent(component,"ODE");
+ activateComponent();
+ container.start();
+
container.deactivateComponent("ODE");
}
public void testProcessLifeCycle() throws Exception {
- container.activateComponent(component, "ODE");
+ activateComponent();
container.start();
// For lack of a better way of doing this:
@@ -97,17 +99,16 @@
container.deactivateComponent("ODE");
container.stop();
-
}
public void testHelloWorld() throws Exception {
- OdeComponent component = new OdeComponent();
- container.activateComponent(component, "ODE");
+ activateComponent();
+ container.start();
// For lack of a better way of doing this:
- component.getServiceUnitManager().deploy("HelloWorld",
"../jbi-examples/src/examples/HelloWorld2/HelloWorld2-process");
- component.getServiceUnitManager().init("HelloWorld",
"../jbi-examples/src/examples/HelloWorld2/HelloWorld2-process");
+ component.getServiceUnitManager().deploy("HelloWorld",
"../distro-jbi/src/examples/HelloWorld2/HelloWorld2-process/");
+ component.getServiceUnitManager().init("HelloWorld",
"../distro-jbi/src/examples/HelloWorld2/HelloWorld2-process/");
component.getServiceUnitManager().start("HelloWorld");
DefaultServiceMixClient client = new
DefaultServiceMixClient(container);
InOut io = client.createInOutExchange();
@@ -121,5 +122,12 @@
}
+ private void activateComponent() throws Exception {
+ ComponentContextImpl cc = new ComponentContextImpl(container, new
ComponentNameSpace(container.getName(), "ODE"));
+ ActivationSpec activationSpec = new ActivationSpec();
+ activationSpec.setComponent(component);
+ activationSpec.setComponentName("ODE");
+ container.activateComponent(odeDir, component, "", cc, activationSpec,
true, false, false, null);
+ }
}
Modified: incubator/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml?view=diff&rev=525981&r1=525980&r2=525981
==============================================================================
--- incubator/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml (original)
+++ incubator/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml Thu Apr 5
15:20:38 2007
@@ -16,6 +16,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<HelloRequest xmlns="urn:/HelloWorld2.wsdl">
- <text>hello</text>
-</HelloRequest>
+ <message xmlns="http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper";>
+ <part>
+ <HelloRequest xmlns="urn:/HelloWorld2.wsdl">
+ <text>hello</text>
+ </HelloRequest>
+ </part>
+</message>
