Resolve a lot of OSGi access violations. More to be fixed.

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

2 files changed, 24 insertions, 16 deletions

diff --git a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
index 6fccae51ba..f2d58f098c 100644
--- a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
@@ -18,20 +18,28 @@ Bnd-LastModified: 1225397486843
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Transaction Policy Model

-Import-Package: javax.transaction;version="1.0.1",javax.xml.namespace,

- javax.xml.stream,org.apache.geronimo.transaction.log,org.apache.geron

- imo.transaction.manager,org.apache.tuscany.sca.assembly;version="1.4"

- ,org.apache.tuscany.sca.contribution.processor;version="1.4",org.apac

- he.tuscany.sca.contribution.resolver;version="1.4",org.apache.tuscany

- .sca.core;version="1.4",org.apache.tuscany.sca.definitions;version="1

- .4",org.apache.tuscany.sca.definitions.util;version="1.4",org.apache.

- tuscany.sca.interfacedef;version="1.4",org.apache.tuscany.sca.invocat

- ion;version="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.ap

- ache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca.policy.t

- ransaction;version="1.4",org.apache.tuscany.sca.provider;version="1.4

- ",org.apache.tuscany.sca.runtime;version="1.4",junit.framework;resolu

- tion:=optional,javax.transaction.xa;version="1.1";resolution:=optiona

- l

+Import-Package: javax.resource.spi,

+ javax.transaction;version="1.0.1",

+ javax.transaction.xa;version="1.1";resolution:=optional,

+ javax.xml.namespace,

+ javax.xml.stream,

+ junit.framework;resolution:=optional,

+ org.apache.geronimo.transaction.log,

+ org.apache.geronimo.transaction.manager,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.contribution.resolver;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.definitions.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.monitor;version="1.4",

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.transaction;version="1.4",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.objectweb.howl.log;version="1.0.1"

 Bundle-SymbolicName: org.apache.tuscany.sca.policy.transaction

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index a13748f232..3a397e10d0 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.policy.transaction;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.policy.Policy;
 
 /**
@@ -30,7 +29,8 @@ import org.apache.tuscany.sca.policy.Policy;
  * @version $Rev$ $Date$
  */
 public interface TransactionPolicy extends Policy {
-    QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "transactionPolicy");
+    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    QName NAME = new QName(SCA10_TUSCANY_NS, "transactionPolicy");
 
     enum Action {
         PROPAGATE, SUSPEND, REQUIRE_GLOBAL, REQUIRE_LOCAL, REQUIRE_NONE