Change the package names and bundle symbolic name to avoid conflicts in OSGi

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@677065 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 8 insertions, 8 deletions

diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml
index e2dbafd0aa..f722c4ba9f 100644
--- a/java/sca/modules/implementation-bpel-ode/pom.xml
+++ b/java/sca/modules/implementation-bpel-ode/pom.xml
@@ -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>

diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index a48d5cb20a..7086e1bc2f 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
@@ -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;
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
index 4233db44e7..c5d6555a24 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
@@ -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;
 
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index df194dd68d..f301082d59 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
@@ -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;
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b6481b1512..3bce8aa9ab 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/java/sca/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
@@ -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

diff --git a/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java b/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
index ac21d47962..360df0b2c5 100644
--- a/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
+++ b/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
@@ -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;
diff --git a/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
index a3aa39127c..82b3c09723 100644
--- a/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
+++ b/java/sca/modules/implementation-bpel-ode/src/test/resources/log4j.properties
@@ -28,7 +28,7 @@ log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
 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