You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/08/19 15:18:27 UTC
svn commit: r987157 [1/2] - in /ode/trunk: ./ axis2-bundle/
axis2-bundle/src/ axis2-bundle/src/main/ axis2-bundle/src/main/java/
axis2-bundle/src/main/java/org/ axis2-bundle/src/main/java/org/apache/
axis2-bundle/src/main/java/org/apache/ode/ axis2-bun...
Author: rr
Date: Thu Aug 19 13:18:25 2010
New Revision: 987157
URL: http://svn.apache.org/viewvc?rev=987157&view=rev
Log:
ODE-784: Implement OSGi packaging for ODE
Added:
ode/trunk/axis2-bundle/
ode/trunk/axis2-bundle/pom.xml
ode/trunk/axis2-bundle/src/
ode/trunk/axis2-bundle/src/main/
ode/trunk/axis2-bundle/src/main/java/
ode/trunk/axis2-bundle/src/main/java/org/
ode/trunk/axis2-bundle/src/main/java/org/apache/
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeActivator.java
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2.java
ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2Impl.java
ode/trunk/axis2-bundle/src/main/resources/
ode/trunk/axis2-bundle/src/main/resources/META-INF/
ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/
ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/ode-axis2.xml
ode/trunk/axis2-bundle/src/main/resources/axis2.xml
ode/trunk/axis2-bundle/src/main/resources/processes/
ode/trunk/axis2-bundle/src/main/resources/processes/README.txt
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEAxis2Server.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/EmbeddedDB.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/ExternalDB.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/InternalDB.java
ode/trunk/jbi/src/test/resources/jndi-entries.xml
Modified:
ode/trunk/Rakefile
ode/trunk/axis2-war/pom.xml
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ClusteredOutgoingTrafficTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointTimeoutsTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/NoP2PTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SelectorsTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ServiceFaultCatchTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationUnicityTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanTestBase.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/ProcessCronCleanupTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/SystemCronCleanupTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/RedeployTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/Retire2Test.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/RetireTestVar.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEConfigProperties.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
ode/trunk/bpel-store/pom.xml
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java
ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
ode/trunk/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/trunk/dao-hibernate-db/pom.xml
ode/trunk/dao-hibernate/pom.xml
ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
ode/trunk/dependencies.rb
ode/trunk/jbi/pom.xml
ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
ode/trunk/jbi/src/test/resources/CommunicationJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/DigestJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/EmptyRespJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/ExtVarJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/HelloWorldJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/MagicSessionExternalJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/MagicSessionJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/OnEventAlarmJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/ReplayerJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/RetireJbiTest/smx.xml
ode/trunk/jbi/src/test/resources/SpringPropertiesJbiTest/smx.xml
ode/trunk/pom.xml
Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Aug 19 13:18:25 2010
@@ -105,7 +105,7 @@ define "ode" do
test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" }
#:java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx1024M', '-XX:MaxPermSize=1024m']
- test.with projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J, H2::REQUIRES
+ test.with projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, SLF4J, LOG4J, H2::REQUIRES, SPRING_TEST
webapp_dir = "#{test.compile.target}/webapp"
test.setup task(:prepare_webapp) do |task|
cp_r _("src/main/webapp"), test.compile.target.to_s
@@ -207,7 +207,7 @@ define "ode" do
BACKPORT, COMMONS.pool, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.transaction,
GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb,
OPENJPA, XERCES, XALAN, LOG4J, SLF4J,
- DOM4J, HIBERNATE,
+ DOM4J, HIBERNATE, SPRING_TEST,
"tranql:tranql-connector-derby-common:jar:1.1"
package :jar
@@ -243,7 +243,8 @@ define "ode" do
resources hibernate_doclet(:package=>"org.apache.ode.store.hib", :excludedtags=>"@version,@author,@todo")
test.with COMMONS.collections, COMMONS.lang, JAVAX.connector, JAVAX.transaction, DOM4J, LOG4J,
- XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction
+ XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction, SLF4J, SPRING_TEST, DERBY,
+ GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb
package :jar
end
@@ -251,14 +252,15 @@ define "ode" do
define "bpel-test" do
compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime",
"bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents", "scheduler-simple"),
- DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, COMMONS.io,
+ DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, COMMONS.io, COMMONS.logging,
GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, JAVAX.transaction, TRANQL, "tranql:tranql-connector-derby-common:jar:1.1",
+ SPRING_TEST,
COMMONS.codec
test.using :properties=>{ "org.apache.ode.autoRetireProcess"=>"true" }
test.with projects("bpel-obj", "jacob", "bpel-schemas",
"bpel-scripts"),
- COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, JAVAX.connector,
+ COMMONS.collections, COMMONS.lang, DERBY, JAVAX.connector,
JAVAX.stream, JAVAX.transaction, JAXEN, HSQLDB, LOG4J, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, SLF4J, DOM4J,
JAVAX.connector
@@ -283,7 +285,7 @@ define "ode" do
task "compile" => "hbm-hack"
test.with project("bpel-epr"), BACKPORT, COMMONS.collections, COMMONS.lang, DERBY, COMMONS.logging, COMMONS.pool, COMMONS.dbcp, LOG4J, SLF4J,
- GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, SPRING
+ GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, SPRING, SPRING_TEST
package :jar
end
Added: ode/trunk/axis2-bundle/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/pom.xml?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/pom.xml (added)
+++ ode/trunk/axis2-bundle/pom.xml Thu Aug 19 13:18:25 2010
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2-bundle</artifactId>
+ <name>ODE :: Axis2 Bundle</name>
+ <packaging>bundle</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ </properties>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>1.3.5-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+<!-- <Export-Package>org.apache.ode*;version=${ode.version};-split-package:=merge-first</Export-Package>-->
+ <Export-Package>org.apache.ode*;version=${ode.version}</Export-Package>
+ <Import-Package>
+ !com.sun.mirror*,
+ !junit.framework*,
+ !org.apache.axis2.client*,
+ !org.apache.tools.ant*,
+ javax.transaction*;version="1.1",
+ org.springframework.beans.factory.xml;version="2.5",
+ org.springframework.context;version="2.5",
+ org.apache.axis2,
+ org.hibernate*;version="3.2.5",
+ org.hibernate.dialect;version="3.2.5",
+ </Import-Package>
+ <!--
+ *;resolution:=optional
+ org.tranql.connector.jdbc,
+ org.apache.commons.httpclient*;version="3.0",
+ org.apache.commons.logging*;version="1.1",
+ org.apache.commons*,
+ org.apache.geronimo.transaction.manager;version="2.0",
+ org.osgi.service.command;version="[0.2,1)",
+ org.springframework.beans.factory.xml;version="2.5",
+ org.apache.geronimo.transaction.manager,
+ org.tranql.connector.jdbc,
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
+ org.jaxen.saxpath,
+ net.sf.saxon.xpath,
+ -->
+<Embed-Dependency>*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml</Embed-Dependency>
+
+ <DynamicImport-Package>*</DynamicImport-Package>
+<Include-Resource>
+src/main/resources,
+@../dao-jpa-ojpa-derby/target/ode-dao-jpa-ojpa-derby-${project.version}.zip,
+@../dao-hibernate-db/target/ode-dao-hibernate-db-${project.version}.zip,
+</Include-Resource>
+
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+</project>
Added: ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeActivator.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeActivator.java?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeActivator.java (added)
+++ ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeActivator.java Thu Aug 19 13:18:25 2010
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.axis2.osgi;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.ode.axis2.ODEAxis2Server;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public class OdeActivator implements BundleActivator {
+
+ private File rootDir;
+ private String generatedName;
+
+ private ODEAxis2Server server;
+
+ public void start(BundleContext context) throws Exception {
+ System.out.println("start ode process");
+// generatedName = context.getBundle().getSymbolicName();
+// rootDir = context.getDataFile("bpelData");
+// rootDir.mkdirs();
+// Enumeration<?> en = context.getBundle().findEntries("/", "*", false);
+// while (en.hasMoreElements()) {
+// copyOne(rootDir, (URL) en.nextElement());
+// }
+// ServiceReference[] refs = context.getAllServiceReferences(
+// "javax.jbi.component.Component", "(&(NAME=OdeBpelEngine))");
+// if (refs == null || refs.length != 1) {
+// throw new RuntimeException("no appropriate service :(");
+// }
+// ServiceUnitManager suM = ((Component) context.getService(refs[0]))
+// .getServiceUnitManager();
+// ClassLoader l = Thread.currentThread().getContextClassLoader();
+// try {
+// ClassLoader suL = suM.getClass().getClassLoader();
+// Thread.currentThread().setContextClassLoader(new BundleClassLoader(suL, context.getBundle()));
+// suM.deploy(generatedName, rootDir.getAbsolutePath());
+// suM.init(generatedName, rootDir.getAbsolutePath());
+// suM.start(generatedName);
+// } finally {
+// Thread.currentThread().setContextClassLoader(l);
+// }
+
+ }
+
+// private void copyOne(File dest, URL url) throws Exception {
+// File d = new File(dest, url.getPath());
+// InputStream str = url.openStream();
+// if (str != null) {
+// FileWriter wr = new FileWriter(d);
+// try {
+// IOUtils.copy(str, wr);
+// } finally {
+// wr.flush();
+// wr.close();
+// }
+// }
+// }
+
+ public void stop(BundleContext context) throws Exception {
+ System.out.println("stop ode process");
+
+// ServiceReference[] refs = context.getAllServiceReferences(
+// "javax.jbi.component.Component", "(&(NAME=OdeBpelEngine))");
+// if (refs == null || refs.length != 1) {
+// throw new RuntimeException("no appropriate service :(");
+// }
+// ServiceUnitManager suM = ((Component) context.getService(refs[0]))
+// .getServiceUnitManager();
+// suM.shutDown(generatedName);
+// suM.undeploy(generatedName, rootDir.getAbsolutePath());
+
+ }
+
+// public class BundleClassLoader extends ClassLoader {
+// private final Bundle delegate;
+//
+// public BundleClassLoader(ClassLoader parent, Bundle delegate) {
+// super(parent);
+// this.delegate = delegate;
+// }
+//
+// @Override
+// public Class<?> loadClass(String name) throws ClassNotFoundException {
+// try {
+// return getParent().loadClass(name);
+// } catch (Exception e) {
+// return delegate.loadClass(name);
+// }
+// }
+// }
+
+}
Added: ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2.java?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2.java (added)
+++ ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2.java Thu Aug 19 13:18:25 2010
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.axis2.osgi;
+
+import java.util.Collection;
+import javax.xml.namespace.QName;
+
+public interface OdeAxis2 {
+ public Collection<QName> deployProcess(String bundleName);
+ public void undeployProcess(String bundleName);
+ public boolean isDeployed(String bundleName);
+}
Added: ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2Impl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2Impl.java?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2Impl.java (added)
+++ ode/trunk/axis2-bundle/src/main/java/org/apache/ode/axis2/osgi/OdeAxis2Impl.java Thu Aug 19 13:18:25 2010
@@ -0,0 +1,54 @@
+package org.apache.ode.axis2.osgi;
+
+import java.io.File;
+import java.util.Collection;
+
+import javax.xml.namespace.QName;
+
+import org.apache.ode.axis2.ODEAxis2Server;
+import org.apache.ode.axis2.ODEConfigProperties;
+import org.osgi.framework.BundleContext;
+import org.springframework.osgi.context.BundleContextAware;
+
+public class OdeAxis2Impl implements OdeAxis2, BundleContextAware {
+
+ private ODEAxis2Server server;
+ private BundleContext bundleContext;
+
+ private ODEConfigProperties config;
+
+ public void init() throws Exception {
+ String rootDir = System.getProperty("org.apache.ode.configDir", "ode");
+ File confFile = new File(rootDir + "/conf/axis2.xml");
+ System.out.println("Conf file " + confFile.getAbsolutePath());
+ config = new ODEConfigProperties(new File(rootDir + "/conf"));
+ config.load();
+ server = new ODEAxis2Server(new File(rootDir).getAbsolutePath(), new File(rootDir).getAbsolutePath(), confFile.getAbsolutePath(), Integer.parseInt(config.getProperty("port")), config);
+ server.start();
+ }
+
+ public void destroy() throws Exception {
+ server.stop();
+ server = null;
+ }
+
+ public Collection<QName> deployProcess(String bundleName) {
+ return server.deployProcess(bundleName);
+ }
+
+ public void undeployProcess(String bundleName) {
+ server.undeployProcess(bundleName);
+ }
+
+ public boolean isDeployed(String bundleName) {
+ return server.isDeployed(bundleName);
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setConfig(ODEConfigProperties config) {
+ this.config = config;
+ }
+}
Added: ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/ode-axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/ode-axis2.xml?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/ode-axis2.xml (added)
+++ ode/trunk/axis2-bundle/src/main/resources/META-INF/spring/ode-axis2.xml Thu Aug 19 13:18:25 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ctx="http://www.springframework.org/schema/context"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/osgi-compendium
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+
+<!--
+ <bean id="ode-config-properties" class="org.apache.ode.axis2.ODEConfigProperties">
+ <constructor-arg ref="cmProps"/>
+ </bean>
+ <osgix:cm-properties id="cmProps" persistent-id="org.apache.ode.axis2">
+ <prop key="ode-axis2.db.mode">EMBEDDED</prop>
+ <prop key="ode-axis2.db.ext.dataSource">java:comp/env/jdbc/ode</prop>
+ <prop key="ode-axis2.jca.port">0</prop>
+ <prop key="ode-axis2.port">8180</prop>
+ <prop key="javax.persistence.provider">org.apache.openjpa.persistence.PersistenceProviderImpl</prop>
+ </osgix:cm-properties>
+ <property name="config" ref="ode-config-properties"/>
+ -->
+
+ <bean id="odeAxis2" class="org.apache.ode.axis2.osgi.OdeAxis2Impl" init-method="init" destroy-method="destroy">
+ </bean>
+
+ <osgi:service ref="odeAxis2" interface="org.apache.ode.axis2.osgi.OdeAxis2"/>
+
+</beans>
Added: ode/trunk/axis2-bundle/src/main/resources/axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/resources/axis2.xml?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/resources/axis2.xml (added)
+++ ode/trunk/axis2-bundle/src/main/resources/axis2.xml Thu Aug 19 13:18:25 2010
@@ -0,0 +1,317 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">false</parameter>
+ <parameter name="enableSwA" locked="false">false</parameter>
+
+ <!--Uncomment if you want to enable file caching for attachments -->
+ <!--parameter name="cacheAttachments" locked="false">true</parameter>
+ <parameter name="attachmentDIR" locked="false"></parameter>
+ <parameter name="sizeThreshold" locked="false">4000</parameter-->
+
+ <!--This will give out the timout of the configuration contexts, in seconds-->
+ <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
+
+ <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+ <!--that behaviour.-->
+ <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+
+ <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
+ <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+ <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+ <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+ <parameter name="DrillDownToRootCauseForFaultReason" locked="false">true</parameter>
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+ <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+ <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
+ <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+ <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
+
+
+
+ <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+ <!--root which can configured using the following contextRoot parameter-->
+ <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+
+ <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
+ <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
+ <!--context path to proper Axis2 servlets-->
+ <parameter name="servicePath" locked="false">processes</parameter>
+ <!--<parameter name="restPath" locked="false">rest</parameter>-->
+
+
+ <!--Set the flag to true if you want to enable transport level session mangment-->
+ <parameter name="manageTransportSession" locked="false">false</parameter>
+
+ <!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
+ <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
+ <!--parameters help to tweak the message handling of two main servlets. -->
+
+ <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet will handle both SOAP and REST messages -->
+ <parameter name="enableRESTInAxis2MainServlet" locked="true">true</parameter>
+
+ <!-- Following parameter will completely disable REST handling in both the servlets-->
+ <parameter name="disableREST" locked="true">false</parameter>
+
+ <!-- This will disable the separate servlet we have for REST handling. -->
+ <parameter name="disableSeparateEndpointForREST" locked="true">true</parameter>
+
+ <!-- If you have a frontend host which exposes this webservice using a different public URL -->
+ <!-- use this parameter to override autodetected url -->
+ <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http"
+ class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">8080</parameter>
+ <!-- Here is the complete list of supported parameters (see example settings further below):
+ port: the port to listen on (default 6060)
+ hostname: if non-null, url prefix used in reply-to endpoint references (default null)
+ originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1")
+ requestTimeout: value in millis of time that requests can wait for data (default 20000)
+ requestTcpNoDelay: true to maximize performance and minimize latency (default true)
+ false to minimize bandwidth consumption by combining segments
+ requestCoreThreadPoolSize: number of threads available for request processing (unless queue fills up) (default 25)
+ requestMaxThreadPoolSize: number of threads available for request processing if queue fills us (default 150)
+ note that default queue never fills up: see HttpFactory
+ threadKeepAliveTime: time to keep threads in excess of core size alive while inactive (default 180)
+ note that no such threads can exist with default unbounded request queue
+ threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS)
+ -->
+ <!-- <parameter name="hostname" locked="false">http://www.myApp.com/ws</parameter> -->
+ <!-- <parameter name="originServer" locked="false">My-Server/1.1</parameter> -->
+ <!-- <parameter name="requestTimeout" locked="false">10000</parameter> -->
+ <!-- <parameter name="requestTcpNoDelay" locked="false">false</parameter> -->
+ <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter> -->
+ <!-- <parameter name="RequestMaxThreadPoolSize" locked="false">100</parameter> -->
+ <!-- <parameter name="threadKeepAliveTime" locked="false">240000</parameter> -->
+ <!-- <parameter name="threadKeepAliveTimeUnit" locked="false">MILLISECONDS</parameter> -->
+ </transportReceiver>
+
+ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
+ <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
+
+ <!--Uncomment if you want to have SMTP transport support-->
+ <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
+ <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
+ <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+ <!--</transportReceiver>-->
+
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter-->>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncomment following paramter , and set as you required.-->
+ <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+ <!-- /transportReceiver -->
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--transportSender name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPTransportSender"/-->
+ <transportSender name="local"
+ class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
+ <transportSender name="jms"
+ class="org.apache.axis2.transport.jms.JMSSender"/>
+ -->
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Uncomment this to enable Addressing -->
+ <!-- module ref="addressing"/-->
+ <!-- Uncomment this to enable Security -->
+ <!-- <module ref="rampart"/> -->
+
+ <!--Configuring module , providing parameters for modules whether they refer or not-->
+ <!--<moduleConfig name="addressing">-->
+ <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+ <!--</moduleConfig>-->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre defined phases -->
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="ODEAxisServiceDispatcher"
+ class="org.apache.ode.axis2.hooks.ODEAxisServiceDispatcher"/>
+ </phase>
+ <phase name="Security"/>
+ <phase name="Addressing">
+ <handler name="ODEAxisOperationDispatcher"
+ class="org.apache.ode.axis2.hooks.ODEAxisOperationDispatcher"/>
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="ProcessHeader">
+ <handler name="SessionInHandler"
+ class="org.apache.ode.axis2.hooks.SessionInHandler">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <phase name="OperationInPhase"/>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="ProcessHeader">
+ <handler name="SessionOutHandler"
+ class="org.apache.ode.axis2.hooks.SessionOutHandler">
+ <order phase="PreDispatch"/>
+ </handler>
+ </phase>
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <phase name="Security"/>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ </phase>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+</axisconfig>
+
Added: ode/trunk/axis2-bundle/src/main/resources/processes/README.txt
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-bundle/src/main/resources/processes/README.txt?rev=987157&view=auto
==============================================================================
--- ode/trunk/axis2-bundle/src/main/resources/processes/README.txt (added)
+++ ode/trunk/axis2-bundle/src/main/resources/processes/README.txt Thu Aug 19 13:18:25 2010
@@ -0,0 +1 @@
+Processes directory
Modified: ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/pom.xml?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Thu Aug 19 13:18:25 2010
@@ -138,6 +138,24 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-spring</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -247,7 +265,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java Thu Aug 19 13:18:25 2010
@@ -162,7 +162,18 @@ public abstract class Axis2TestBase {
String odeRootAbsolutePath = getClass().getClassLoader().getResource("webapp/WEB-INF").getFile();
String axis2RepoAbsolutePath = getClass().getClassLoader().getResource(axis2RepoDir).getFile();
String axis2ConfAbsolutePath = axis2ConfLocation == null ? null : getClass().getClassLoader().getResource(axis2ConfLocation).getFile();
- server = new ODEAxis2Server(odeRootAbsolutePath, axis2RepoAbsolutePath, axis2ConfAbsolutePath);
+ ODEConfigProperties config = new ODEConfigProperties(new File(System.getProperty("org.apache.ode.configDir", odeRootAbsolutePath + "/conf.hib-derby")));
+ config.load();
+ server = new ODEAxis2Server(odeRootAbsolutePath, axis2RepoAbsolutePath, axis2ConfAbsolutePath, getTestPort(0), config);
+ server.txMgrCreatedCallback = new Runnable() {
+ public void run() {
+ try {
+ org.springframework.mock.jndi.SimpleNamingContextBuilder.emptyActivatedContextBuilder().bind("java:comp/UserTransaction", server.getODEServer().getTransactionManager());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ };
server.start();
}
@@ -230,127 +241,23 @@ public abstract class Axis2TestBase {
}
server = null;
}
+
+ public String sendRequestFile(String endpoint, String bundleName, String filename) {
+ return sendRequestFile(endpoint, bundleName + "/" + filename);
+ }
- protected class ODEAxis2Server extends AxisServer {
-
- ODEServer _ode;
- String odeRootDir;
-
- protected ODEAxis2Server(String odeRootDir, String axis2RepoDir, String axis2ConfLocation) throws Exception {
- super(false);
- this.odeRootDir = odeRootDir;
- if (log.isInfoEnabled()) {
- log.info("Ode Root Dir: " + odeRootDir);
- log.info("Axis2 Conf file: " + axis2ConfLocation);
- log.info("Axis2 Repo dir: " + axis2RepoDir);
- }
-
- configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoDir, axis2ConfLocation);
- // do not use 8080 for tests, and make sure to pass a string, not an int
- configContext.getAxisConfiguration().getTransportIn("http").addParameter(new Parameter("port", ""+getTestPort(0)));
- }
-
- protected void start() throws AxisFault {
- super.start();
- _ode = new ODEServer();
- try {
- _ode.init(odeRootDir, configContext.getAxisConfiguration());
- } catch (ServletException e) {
- throw new RuntimeException(e.getRootCause());
- }
- }
-
- public void stop() throws AxisFault {
- _ode.shutDown();
- super.stop();
- }
-
- public Collection<QName> deployProcess(String bundleName) {
- return _ode.getProcessStore().deploy(new File(getResource(bundleName)));
- }
-
- public void undeployProcess(String bundleName) {
- _ode.getProcessStore().undeploy(new File(getResource(bundleName)));
- }
-
- public boolean isDeployed(String bundleName) {
- return _ode.getProcessStore().getPackages().contains(bundleName);
- }
-
- /**
- * Creates and deploys an Axis service based on a provided MessageReceiver. The receiver
- * will be invoked for all invocations of that service.
- */
- protected void deployService(String bundleName, String defFile, QName serviceName, String port,
- MessageReceiver receiver) throws WSDLException, IOException, URISyntaxException {
- URI wsdlUri = new File(getResource(bundleName) + "/" + defFile).toURI();
-
- InputStream is = wsdlUri.toURL().openStream();
- WSDL11ToAxisServiceBuilder serviceBuilder = new ODEAxisService.WSDL11ToAxisPatchedBuilder(is, serviceName, port);
- serviceBuilder.setBaseUri(wsdlUri.toString());
- serviceBuilder.setCustomResolver(new Axis2UriResolver());
- serviceBuilder.setCustomWSLD4JResolver(new Axis2WSDLLocator(wsdlUri));
- serviceBuilder.setServerSide(true);
-
- AxisService axisService = serviceBuilder.populateService();
- axisService.setName(serviceName.getLocalPart());
- axisService.setWsdlFound(true);
- axisService.setCustomWsdl(true);
- axisService.setClassLoader(getConfigurationContext().getAxisConfiguration().getServiceClassLoader());
-
- Iterator operations = axisService.getOperations();
- while (operations.hasNext()) {
- AxisOperation operation = (AxisOperation) operations.next();
- if (operation.getMessageReceiver() == null) {
- operation.setMessageReceiver(receiver);
- }
- }
- getConfigurationContext().getAxisConfiguration().addService(axisService);
- }
-
- public String sendRequestFile(String endpoint, String bundleName, String filename) {
- return sendRequestFile(endpoint, bundleName + "/" + filename);
- }
-
- public String sendRequestFile(String endpoint, String filename) {
- try {
- URL url = new URL(endpoint);
- // override the port if necessary but only if the given port is the default one
- if(url.getPort()==DEFAULT_TEST_PORT_0 && url.getPort()!=getTestPort(0)){
- url= new URL(url.getProtocol()+"://"+url.getHost()+":"+getTestPort(0)+url.getPath()+(url.getQuery()!=null?"?"+url.getQuery():""));
- }
- return HttpSoapSender.doSend(url,
- new FileInputStream(getResource(filename)), null, 0, null, null, null);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected String getResource(String bundleName) {
- return getClass().getClassLoader().getResource(bundleName).getFile();
- }
-
- /**
- * Convenient methods to generate a WSDL for an Axis2 service. Often nice, but also often
- * generates crappy WSDL that aren't even valid (especially when faults are involved) so
- * use with care.
- *
- * @param serviceName
- * @param fileName
- * @throws AxisFault
- */
- protected void generateWSDL(String serviceName, String fileName) throws AxisFault {
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(fileName);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- configContext.getAxisConfiguration().getService(serviceName).printWSDL(fos);
- }
-
- public ODEServer getODEServer() {
- return _ode;
+ public String sendRequestFile(String endpoint, String filename) {
+ try {
+ URL url = new URL(endpoint);
+ // override the port if necessary but only if the given port is the default one
+ if(url.getPort()==DEFAULT_TEST_PORT_0 && url.getPort()!=getTestPort(0)){
+ url= new URL(url.getProtocol()+"://"+url.getHost()+":"+getTestPort(0)+url.getPath()+(url.getQuery()!=null?"?"+url.getQuery():""));
+ }
+ return HttpSoapSender.doSend(url,
+ new FileInputStream(server.getResource(filename)), null, 0, null, null, null);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
}
+
}
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/BpelActivityTest.java Thu Aug 19 13:18:25 2010
@@ -36,7 +36,7 @@ public class BpelActivityTest extends Ax
public void run() {
try {
Thread.sleep(3000);
- String response = server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
+ String response = sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
bundleName, "testRequest.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -48,7 +48,7 @@ public class BpelActivityTest extends Ax
public void run() {
try {
Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
+ sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
bundleName, "testRequest.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -64,7 +64,7 @@ public class BpelActivityTest extends Ax
try {
Thread.currentThread().setName("FIRST CLIENT");
- server.sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
+ sendRequestFile("http://localhost:8888/ode/processes/OnEventCorrelation/",
bundleName, "testRequest.soap");
Thread.sleep(9000);
} catch( Exception e ) {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ClusteredOutgoingTrafficTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ClusteredOutgoingTrafficTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ClusteredOutgoingTrafficTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ClusteredOutgoingTrafficTest.java Thu Aug 19 13:18:25 2010
@@ -38,7 +38,7 @@ public class ClusteredOutgoingTrafficTes
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/ode/processes/PingPongService/",
+ String response = sendRequestFile("http://localhost:8888/ode/processes/PingPongService/",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue(response.contains("clusterOutput"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java Thu Aug 19 13:18:25 2010
@@ -51,7 +51,7 @@ public class EndpointConfigurationTest e
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld",
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld",
bundleName, "testRequest.soap");
assertTrue(response.contains("helloResponse") && response.contains("OK!!!"));
} finally {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointTimeoutsTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointTimeoutsTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointTimeoutsTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/EndpointTimeoutsTest.java Thu Aug 19 13:18:25 2010
@@ -40,7 +40,7 @@ public class EndpointTimeoutsTest extend
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld",
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue("A timeout exception was expected", response.contains("<soapenv:Fault") && response.contains("Timeout or execution error when waiting for response to MEX"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/FailureInvokeTest.java Thu Aug 19 13:18:25 2010
@@ -40,7 +40,7 @@ public class FailureInvokeTest extends A
try {
new Thread(new Killer(this)).start();
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/invokeFailureTest",
+ String response = sendRequestFile("http://localhost:8888/processes/invokeFailureTest",
bundleName, "testRequest.soap");
System.out.println("=> " + response);
} catch (Exception e) {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/MessageStructureTest.java Thu Aug 19 13:18:25 2010
@@ -33,7 +33,7 @@ public class MessageStructureTest extend
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/attrNSWorld",
+ String response = sendRequestFile("http://localhost:8888/processes/attrNSWorld",
bundleName, "testRequest.soap");
Element domResponse = DOMUtils.stringToDOM(response);
Element out = DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(domResponse)));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/NoP2PTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/NoP2PTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/NoP2PTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/NoP2PTest.java Thu Aug 19 13:18:25 2010
@@ -38,7 +38,7 @@ public class NoP2PTest extends Axis2Test
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/ode/processes/PingPongService/",
+ String response = sendRequestFile("http://localhost:8888/ode/processes/PingPongService/",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue(response.contains("magic"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SelectorsTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SelectorsTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SelectorsTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SelectorsTest.java Thu Aug 19 13:18:25 2010
@@ -37,7 +37,7 @@ public class SelectorsTest extends Axis2
String bundleName = "TestSelectors";
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
- String response = server.sendRequestFile("http://localhost:8888/ode/processes/Project-Reproduce-Isolation-Problem/ReproduceIsolationProblem/Pool2/Pool",
+ String response = sendRequestFile("http://localhost:8888/ode/processes/Project-Reproduce-Isolation-Problem/ReproduceIsolationProblem/Pool2/Pool",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue(response.contains("_21Response"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ServiceFaultCatchTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ServiceFaultCatchTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ServiceFaultCatchTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/ServiceFaultCatchTest.java Thu Aug 19 13:18:25 2010
@@ -37,7 +37,7 @@ public class ServiceFaultCatchTest exten
if (server.isDeployed(bundleName)) server.undeployProcess(bundleName);
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld",
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld",
bundleName, "testRequest.soap");
assertTrue(response.contains("helloResponse") && response.contains("Something went wrong. Fortunately, it was meant to be."));
} finally {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java Thu Aug 19 13:18:25 2010
@@ -110,7 +110,7 @@ public class SoapHeader2Test extends Axi
// deploy the required service
if (!server.isDeployed(bundleName)) server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/hello/hello/process/client",
+ String response = sendRequestFile("http://localhost:8888/processes/hello/hello/process/client",
bundleName, "testRequest.soap");
if (log.isDebugEnabled()) log.debug(response);
assertTrue("Soap headers missing!", response.contains("TestSoapHeader2 passed"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeaderTest.java Thu Aug 19 13:18:25 2010
@@ -76,7 +76,7 @@ public class SoapHeaderTest extends Axis
if (!server.isDeployed("TestSoapHeader")) server.deployProcess("TestSoapHeader");
- String response = server.sendRequestFile("http://localhost:8888/processes/headerTest",
+ String response = sendRequestFile("http://localhost:8888/processes/headerTest",
"TestSoapHeader", "testRequest.soap");
System.out.println(response);
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinLazyTest.java Thu Aug 19 13:18:25 2010
@@ -46,7 +46,7 @@ public class CorrelationJoinLazyTest ext
public void run() {
try {
Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -58,7 +58,7 @@ public class CorrelationJoinLazyTest ext
public void run() {
try {
Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest3.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -67,7 +67,7 @@ public class CorrelationJoinLazyTest ext
}.start();
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ String response = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
System.out.println("=>\n" + response);
assertTrue(response.contains(">1;3;2;<"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationJoinTest.java Thu Aug 19 13:18:25 2010
@@ -45,7 +45,7 @@ public class CorrelationJoinTest extends
public void run() {
try {
Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -57,7 +57,7 @@ public class CorrelationJoinTest extends
public void run() {
try {
Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest3.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -66,7 +66,7 @@ public class CorrelationJoinTest extends
}.start();
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ String response = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
System.out.println("=>\n" + response);
assertTrue(response.contains(">1;2;3;<"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationMultiTest.java Thu Aug 19 13:18:25 2010
@@ -40,7 +40,7 @@ public class CorrelationMultiTest extend
public void run() {
try {
Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -49,7 +49,7 @@ public class CorrelationMultiTest extend
}.start();
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ String response = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
assertTrue(response.contains(">1;2;<"));
} catch (Exception e) {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationUnicityTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationUnicityTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationUnicityTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/correlation/CorrelationUnicityTest.java Thu Aug 19 13:18:25 2010
@@ -39,14 +39,14 @@ public class CorrelationUnicityTest exte
server.deployProcess(bundleName);
try {
{
- String response = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ String response = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue(response.contains("correlationUnicity1"));
}
{
- String response = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ String response = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
System.out.println(response);
assertTrue(response.contains("correlationUnicity1"));
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java Thu Aug 19 13:18:25 2010
@@ -69,7 +69,7 @@ public class HttpBindingTest extends Axi
// deploy the required service
if (!server.isDeployed(bundleName)) server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld",
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld",
bundleName, "testRequest.soap");
if (log.isDebugEnabled()) log.debug(response);
int valueInSoapRequest = 100;
@@ -114,7 +114,7 @@ public class HttpBindingTest extends Axi
// then deploy the required service
server.deployProcess(bundleName);
try {
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
System.out.println("Test Response Received: "+response);
if (log.isDebugEnabled()) log.debug("Test Response Received: "+response);
assertTrue("Test failed. Response is:"+response, response.indexOf("What a success!") >= 0);
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/InstanceCountTest.java Thu Aug 19 13:18:25 2010
@@ -114,7 +114,7 @@ public class InstanceCountTest extends A
public void run() {
try {
Thread.sleep(3000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest2.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -125,7 +125,7 @@ public class InstanceCountTest extends A
Thread processOne = new Thread() {
public void run() {
try {
- firstResponse = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ firstResponse = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
System.out.println("=>\n" + firstResponse);
} catch (Exception e) {
@@ -139,7 +139,7 @@ public class InstanceCountTest extends A
public void run() {
try {
Thread.sleep(3000);
- secondResponse = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ secondResponse = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest.soap");
} catch( Exception e ) {
fail(e.getMessage());
@@ -160,7 +160,7 @@ public class InstanceCountTest extends A
public void run() {
try {
Thread.sleep(6000);
- server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleName, "testRequest3.soap");
} catch( Exception e ) {
fail(e.getMessage());
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessCountTest.java Thu Aug 19 13:18:25 2010
@@ -118,7 +118,7 @@ public class ProcessCountTest extends Ax
Thread processOne = new Thread() {
public void run() {
try {
- firstResponse = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ firstResponse = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleOne, "testRequest.soap");
System.out.println("=>\n" + firstResponse);
} catch (Exception e) {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/hydration/ProcessSizeTest.java Thu Aug 19 13:18:25 2010
@@ -118,7 +118,7 @@ public class ProcessSizeTest extends Axi
Thread processOne = new Thread() {
public void run() {
try {
- firstResponse = server.sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
+ firstResponse = sendRequestFile("http://localhost:8888/processes/correlationMultiTest",
bundleOne, "testRequest.soap");
System.out.println("=>\n" + firstResponse);
} catch (Exception e) {
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFailureTest.java Thu Aug 19 13:18:25 2010
@@ -34,7 +34,7 @@ public class CleanFailureTest extends Cl
server.deployProcess(bundleName);
try {
initialLargeDataCount = getLargeDataCount(0);
- server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
+ sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
} finally {
ProcessDAO process = getProcess();
server.undeployProcess(bundleName);
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanFaultTest.java Thu Aug 19 13:18:25 2010
@@ -81,7 +81,7 @@ public class CleanFaultTest extends Clea
try {
initialLargeDataCount = getLargeDataCount(0);
- String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
+ String response = sendRequestFile("http://localhost:8888/processes/helloWorld", bundleName, "testRequest.soap");
System.out.println(response);
assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
process = assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
Modified: ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java?rev=987157&r1=987156&r2=987157&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java (original)
+++ ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/CleanSuccessTest.java Thu Aug 19 13:18:25 2010
@@ -77,7 +77,7 @@ public class CleanSuccessTest extends Cl
try {
initialLargeDataCount = getLargeDataCount(0);
- server.sendRequestFile("http://localhost:8888/processes/FirstProcess/FirstProcess/FirstProcess/Client", bundleName, "testRequest.soap");
+ sendRequestFile("http://localhost:8888/processes/FirstProcess/FirstProcess/FirstProcess/Client", bundleName, "testRequest.soap");
process = assertInstanceCleanup(instances, activityRecoveries, correlationSets, faults, exchanges, routes, messsages, partnerLinks, scopes, variables, events, largeData);
} finally {
try {