Author: rfeng
Date: Tue Jul 15 15:06:58 2008
New Revision: 677065
URL: http://svn.apache.org/viewvc?rev=677065&view=rev
Log:
Change the package names and bundle symbolic name to avoid conflicts in OSGi
Added:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
(props changed)
- copied from r676674,
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
(contents, props changed)
- copied, changed from r676674,
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Removed:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
tuscany/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
tuscany/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
Modified: tuscany/java/sca/modules/implementation-bpel-ode/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/pom.xml?rev=677065&r1=677064&r2=677065&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-ode/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-bpel-ode/pom.xml Tue Jul 15
15:06:58 2008
@@ -430,9 +430,9 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel.ode</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.implementation.bpel*</Export-Package>
+
<Export-Package>org.apache.tuscany.sca.implementation.bpel.ode*</Export-Package>
</instructions>
</configuration>
</plugin>
Propchange:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 15 15:06:58 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider:671193
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=677065&r1=676674&r2=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
Tue Jul 15 15:06:58 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.bpel.provider;
+package org.apache.tuscany.sca.implementation.bpel.ode.provider;
import java.io.File;
import java.net.URL;
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java?rev=677065&r1=676674&r2=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
Tue Jul 15 15:06:58 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.bpel.provider;
+package org.apache.tuscany.sca.implementation.bpel.ode.provider;
import javax.transaction.TransactionManager;
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java?rev=677065&r1=676674&r2=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
Tue Jul 15 15:06:58 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.bpel.provider;
+package org.apache.tuscany.sca.implementation.bpel.ode.provider;
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.Future;
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory?rev=677065&r1=677064&r2=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
Tue Jul 15 15:06:58 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the implementation extension
-org.apache.tuscany.sca.implementation.bpel.provider.BPELImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
+org.apache.tuscany.sca.implementation.bpel.ode.provider.BPELImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
Copied:
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
(from r676674,
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java?p2=tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java&p1=tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java&r1=676674&r2=677065&rev=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
Tue Jul 15 15:06:58 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.bpel;
+package org.apache.tuscany.sca.implementation.bpel.ode;
import java.io.File;
import java.io.StringReader;
Propchange:
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
eol-style = native
Propchange:
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 15 15:06:58 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java:671193
Modified:
tuscany/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties?rev=677065&r1=677064&r2=677065&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
(original)
+++
tuscany/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
Tue Jul 15 15:06:58 2008
@@ -28,7 +28,7 @@
log4j.category.org.apache.ode.bpel.epr=OFF
log4j.category.org.apache.tuscany.sca.implementation.bpel=OFF
log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=OFF
+log4j.category.org.apache.tuscany.sca.implementation.bpel.ode.provider=OFF
# Console appender
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
