From eeb1b4065ba6b008810627c49b16c03bd053f445 Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 3 Nov 2008 20:24:24 +0000 Subject: Fix the bundle dependencies git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@710149 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation-bpel-ode/META-INF/MANIFEST.MF | 44 +++++++++++++++------- .../implementation/bpel/ode/BPELODEDeployFile.java | 21 +++++------ .../implementation/bpel/ode/EmbeddedODEServer.java | 11 +----- .../bpel/ode/TuscanyProcessConfImpl.java | 1 - .../bpel/ode/EmbeddedODEServerTestCase.java | 24 ------------ 5 files changed, 41 insertions(+), 60 deletions(-) (limited to 'branches') diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF index 0636624d2e..e5ffcdcb8b 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF +++ b/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF @@ -12,20 +12,36 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi on -Import-Package: javax.sql,javax.transaction,javax.wsdl,javax.xml.names - pace,org.apache.commons.logging,org.apache.geronimo.transaction.manag - er,org.apache.ode.bpel.compiler,org.apache.ode.bpel.dao,org.apache.od - e.bpel.engine,org.apache.ode.bpel.evt,org.apache.ode.bpel.iapi,org.ap - ache.ode.bpel.memdao,org.apache.ode.il.config,org.apache.ode.il.dbuti - l,org.apache.ode.scheduler.simple,org.apache.ode.utils,org.apache.tus - cany.sca.assembly;version="1.4",org.apache.tuscany.sca.core;version=" - 1.4",org.apache.tuscany.sca.databinding.xml;version="1.4",org.apache. - tuscany.sca.implementation.bpel;version="1.4",org.apache.tuscany.sca. - interfacedef;version="1.4",org.apache.tuscany.sca.interfacedef.wsdl;v - ersion="1.4",org.apache.tuscany.sca.invocation;version="1.4",org.apac - he.tuscany.sca.provider;version="1.4",org.apache.tuscany.sca.runtime; - version="1.4",org.osoa.sca.annotations;version="1.4",org.w3c.dom,juni - t.framework;resolution:=optional +Import-Package: javax.resource.spi, + javax.sql, + javax.transaction;version="1.0.1", + javax.wsdl, + javax.xml.namespace, + junit.framework;resolution:=optional, + org.apache.commons.logging, + org.apache.geronimo.transaction.manager, + org.apache.ode.bpel.compiler, + org.apache.ode.bpel.dao, + org.apache.ode.bpel.engine, + org.apache.ode.bpel.evt, + org.apache.ode.bpel.iapi, + org.apache.ode.bpel.memdao, + org.apache.ode.il.config, + org.apache.ode.il.dbutil, + org.apache.ode.scheduler.simple, + org.apache.ode.utils, + org.apache.tuscany.sca.assembly;version="1.4", + org.apache.tuscany.sca.core;version="1.4", + org.apache.tuscany.sca.databinding.xml;version="1.4", + org.apache.tuscany.sca.implementation.bpel;version="1.4", + org.apache.tuscany.sca.interfacedef;version="1.4", + org.apache.tuscany.sca.interfacedef.wsdl;version="1.4", + org.apache.tuscany.sca.invocation;version="1.4", + org.apache.tuscany.sca.policy;version="1.4.0", + org.apache.tuscany.sca.provider;version="1.4", + org.apache.tuscany.sca.runtime;version="1.4", + org.osoa.sca.annotations;version="1.4", + org.w3c.dom Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode Bundle-DocURL: http://www.apache.org/ diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java index 0b0cd98a66..20373d0819 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java +++ b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java @@ -18,22 +18,21 @@ */ package org.apache.tuscany.sca.implementation.bpel.ode; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.tuscany.sca.implementation.bpel.BPELImplementation; -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.Reference; - import java.io.File; -import java.io.PrintStream; -import java.io.IOException; import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.net.URI; -import java.net.URL; +import java.util.List; import javax.xml.namespace.QName; -import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tuscany.sca.assembly.ComponentType; +import org.apache.tuscany.sca.assembly.Reference; +import org.apache.tuscany.sca.assembly.Service; +import org.apache.tuscany.sca.implementation.bpel.BPELImplementation; /** * A class that handles the deploy.xml file required for each BPEL process by the ODE runtime diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java index 84c40defd9..ed327331db 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java +++ b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java @@ -35,24 +35,15 @@ import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; import org.apache.ode.bpel.engine.BpelServerImpl; import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy; -import org.apache.ode.bpel.iapi.ProcessConf; -import org.apache.ode.bpel.iapi.ProcessStore; -import org.apache.ode.bpel.iapi.ProcessStoreEvent; -import org.apache.ode.bpel.iapi.ProcessStoreListener; import org.apache.ode.bpel.iapi.Scheduler; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; import org.apache.ode.il.config.OdeConfigProperties; import org.apache.ode.il.dbutil.Database; import org.apache.ode.scheduler.simple.JdbcDelegate; import org.apache.ode.scheduler.simple.SimpleScheduler; -import org.apache.ode.store.ProcessStoreImpl; import org.apache.ode.utils.GUID; -import org.apache.tuscany.sca.runtime.RuntimeComponent; - -//-------------- Added by Mike Edwards 16/05/2008 -import org.apache.ode.bpel.iapi.Endpoint; import org.apache.tuscany.sca.implementation.bpel.BPELImplementation; -//-------------- End of Mike Edwards additions +import org.apache.tuscany.sca.runtime.RuntimeComponent; /** * Embedded ODE process server diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java index 22a86a9e0f..c626e6a8e3 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java +++ b/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java @@ -23,7 +23,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.net.URL; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java index 360df0b2c5..0f59990377 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java +++ b/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java @@ -19,34 +19,10 @@ package org.apache.tuscany.sca.implementation.bpel.ode; -import java.io.File; -import java.io.StringReader; -import java.net.URL; -import java.util.concurrent.Future; - import javax.transaction.TransactionManager; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import junit.framework.TestCase; -import org.apache.ode.bpel.iapi.Message; -import org.apache.ode.bpel.iapi.MyRoleMessageExchange; -import org.apache.ode.bpel.iapi.MessageExchange.Status; -import org.apache.ode.utils.DOMUtils; -import org.apache.ode.utils.GUID; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer; -import org.apache.tuscany.sca.implementation.bpel.ode.GeronimoTxFactory; -import org.apache.tuscany.sca.implementation.bpel.ode.ODEDeployment; -import org.w3c.dom.Element; - /** * Test to Deploy and Invoke a HelloWorld BPEL process using EmbeddedODEServer * -- cgit v1.2.3