Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java Thu Oct 30 21:01:44 2008 @@ -20,7 +20,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Policy; /** @@ -30,7 +29,9 @@ * @version $Rev$ $Date$ */ public class BasicAuthenticationPolicy implements Policy { - public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(Constants.SCA10_TUSCANY_NS, "basicAuthentication"); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + + public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "basicAuthentication"); public static final String BASIC_AUTHENTICATION_USERNAME = "username"; public static final String BASIC_AUTHENTICATION_PASSWORD = "password";
Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java Thu Oct 30 21:01:44 2008 @@ -21,14 +21,11 @@ import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; -import java.util.logging.Level; - import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; @@ -42,7 +39,8 @@ * @version $Rev$ $Date$ */ public class BasicAuthenticationPolicyProcessor implements StAXArtifactProcessor<BasicAuthenticationPolicy> { - + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String USER_NAME = "userName"; private static final String PASSWORD = "password"; @@ -97,7 +95,7 @@ writer.writeStartElement(prefix, getArtifactType().getLocalPart(), getArtifactType().getNamespaceURI()); - writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); + writer.writeNamespace("tuscany", SCA10_TUSCANY_NS); if ( policy.getUserName() != null ) { writer.writeStartElement(prefix, Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java Thu Oct 30 21:01:44 2008 @@ -18,19 +18,12 @@ */ package org.apache.tuscany.sca.policy.authentication.basic; -import java.util.logging.ConsoleHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; - import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.policy.Policy; import org.apache.tuscany.sca.policy.PolicySet; /** @@ -40,7 +33,8 @@ * @version $Rev$ $Date$ */ public class BasicAuthenticationReferencePolicyInterceptor implements Interceptor { - public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, "wsBasicAuthentication"); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication"); private Invoker next; private Operation operation; Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java Thu Oct 30 21:01:44 2008 @@ -21,7 +21,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; @@ -35,7 +34,8 @@ * @version $Rev$ $Date$ */ public class BasicAuthenticationServicePolicyInterceptor implements Interceptor { - public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, "wsBasicAuthentication"); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication"); private Invoker next; private Operation operation; Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java Thu Oct 30 21:01:44 2008 @@ -24,7 +24,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Policy; /** @@ -33,7 +32,9 @@ * @version $Rev$ $Date$ */ public class AuthorizationPolicy implements Policy { - public static final QName NAME = new QName(Constants.SCA10_NS, "authorization"); + private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";; + // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName NAME = new QName(SCA10_NS, "authorization"); public static enum AcessControl { permitAll, denyAll, allow Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java Thu Oct 30 21:01:44 2008 @@ -37,7 +37,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java Thu Oct 30 21:01:44 2008 @@ -21,7 +21,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Policy; /** @@ -30,7 +29,8 @@ * @version $Rev$ $Date$ */ public class SecurityIdentityPolicy implements Policy { - public static final QName NAME = new QName(Constants.SCA10_NS, "securityIdentity"); + private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";; + public static final QName NAME = new QName(SCA10_NS, "securityIdentity"); private boolean useCallerIdentity; Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java Thu Oct 30 21:01:44 2008 @@ -35,7 +35,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java Thu Oct 30 21:01:44 2008 @@ -21,7 +21,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Policy; /** @@ -29,7 +28,8 @@ * @version $Rev$ $Date$ */ public class JaasAuthenticationPolicy implements Policy { - public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "jaasAuthentication"); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName NAME = new QName(SCA10_TUSCANY_NS, "jaasAuthentication"); private String configurationName = "other"; private String callbackHandlerClassName; Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java Thu Oct 30 21:01:44 2008 @@ -23,7 +23,6 @@ import javax.security.auth.login.LoginContext; import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.util.PolicyHandler; @@ -34,7 +33,8 @@ */ public class JaasAuthenticationPolicyHandler implements PolicyHandler { private static final String jaasPolicy = "JaasPolicy"; - public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, jaasPolicy); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, jaasPolicy); private PolicySet applicablePolicySet = null; public void setUp(Object... context) { Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java Thu Oct 30 21:01:44 2008 @@ -26,7 +26,6 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; @@ -37,7 +36,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; /** * @@ -46,10 +44,9 @@ public class JaasAuthenticationPolicyProcessor implements StAXArtifactProcessor<JaasAuthenticationPolicy> { private static final QName JAAS_AUTHENTICATION_POLICY_QNAME = JaasAuthenticationPolicy.NAME; private static final String callbackHandler = "callbackHandler"; - public static final QName CALLBACK_HANDLER_QNAME = new QName(Constants.SCA10_TUSCANY_NS, - callbackHandler); - public static final QName CONFIGURATION_QNAME = new QName(Constants.SCA10_TUSCANY_NS, - "configurationName"); + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + public static final QName CALLBACK_HANDLER_QNAME = new QName(SCA10_TUSCANY_NS, callbackHandler); + public static final QName CONFIGURATION_QNAME = new QName(SCA10_TUSCANY_NS, "configurationName"); private Monitor monitor; public QName getArtifactType() { @@ -122,7 +119,7 @@ writer.writeStartElement(prefix, JAAS_AUTHENTICATION_POLICY_QNAME.getLocalPart(), JAAS_AUTHENTICATION_POLICY_QNAME.getNamespaceURI()); - writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS); + writer.writeNamespace("tuscany", SCA10_TUSCANY_NS); writer.writeEndElement(); Modified: tuscany/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java (original) +++ tuscany/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java Thu Oct 30 21:01:44 2008 @@ -33,7 +33,6 @@ import junit.framework.Assert; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy; import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor; @@ -45,6 +44,7 @@ * @version $Rev$ $Date$ */ public class PolicyProcessorTestCase { + private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";; private final static List<String> SEQ = Arrays.asList("permitAll", "allow [r1, r2]", @@ -62,10 +62,10 @@ Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>(); processors.put(AuthorizationPolicy.NAME, new AuthorizationPolicyProcessor(null,null)); processors.put(SecurityIdentityPolicy.NAME, new SecurityIdentityPolicyProcessor(null,null)); - processors.put(new QName(Constants.SCA10_NS, "allow"), new AuthorizationPolicyProcessor(null,null)); - processors.put(new QName(Constants.SCA10_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null)); - processors.put(new QName(Constants.SCA10_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null)); - processors.put(new QName(Constants.SCA10_NS, "runAs"), new SecurityIdentityPolicyProcessor(null,null)); + processors.put(new QName(SCA10_NS, "allow"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA10_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA10_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA10_NS, "runAs"), new SecurityIdentityPolicyProcessor(null,null)); InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml"); XMLInputFactory factory = XMLInputFactory.newInstance(); XMLStreamReader reader = factory.createXMLStreamReader(is); Modified: tuscany/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF (original) +++ tuscany/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008 @@ -18,20 +18,28 @@ 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/ Modified: tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java (original) +++ tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java Thu Oct 30 21:01:44 2008 @@ -21,7 +21,6 @@ import javax.xml.namespace.QName; -import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.policy.Policy; /** @@ -30,7 +29,8 @@ * @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 Modified: tuscany/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java (original) +++ tuscany/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java Thu Oct 30 21:01:44 2008 @@ -26,10 +26,10 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.DefaultContributionFactory; +import org.apache.tuscany.sca.contribution.namespace.DefaultNamespaceImportExportFactory; import org.apache.tuscany.sca.contribution.namespace.NamespaceExport; import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory; -import org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportExportFactoryImpl; import org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory; import org.apache.tuscany.sca.workspace.Workspace; import org.apache.tuscany.sca.workspace.WorkspaceFactory; @@ -49,7 +49,7 @@ public void setUp() throws Exception { contributionFactory = new DefaultContributionFactory(); workspaceFactory = new DefaultWorkspaceFactory(); - importExportFactory = new NamespaceImportExportFactoryImpl(); + importExportFactory = new DefaultNamespaceImportExportFactory(); } @Override Modified: tuscany/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF (original) +++ tuscany/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008 @@ -9,12 +9,16 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Domain Workspace XML Model -Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan - y.sca.contribution;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.tu - scany.sca.monitor;version="1.4",org.apache.tuscany.sca.workspace;vers - ion="1.4",org.junit;resolution:=optional +Import-Package: javax.xml.namespace, + javax.xml.stream, + org.apache.tuscany.sca.assembly;version="1.4.0", + org.apache.tuscany.sca.contribution;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.monitor;version="1.4", + org.apache.tuscany.sca.workspace;version="1.4", + org.junit;resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.workspace.xml Bundle-DocURL: http://www.apache.org/ Modified: tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java Thu Oct 30 21:01:44 2008 @@ -37,7 +37,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.workspace.Workspace; /** Modified: tuscany/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF (original) +++ tuscany/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008 @@ -14,12 +14,15 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Domain Workspace Model -Import-Package: org.apache.tuscany.sca.contribution;version="1.4",org. - apache.tuscany.sca.contribution.resolver;version="1.4",org.apache.tus - cany.sca.core;version="1.4",org.apache.tuscany.sca.extensibility;vers - ion="1.4",org.apache.tuscany.sca.monitor;version="1.4",org.apache.tus - cany.sca.workspace;version="1.4",org.apache.tuscany.sca.workspace.bui - lder;version="1.4" +Import-Package: org.apache.tuscany.sca.assembly;version="1.4.0", + org.apache.tuscany.sca.contribution;version="1.4", + org.apache.tuscany.sca.contribution.resolver;version="1.4", + org.apache.tuscany.sca.core;version="1.4", + org.apache.tuscany.sca.extensibility;version="1.4", + org.apache.tuscany.sca.interfacedef;version="1.4.0", + org.apache.tuscany.sca.monitor;version="1.4", + org.apache.tuscany.sca.workspace;version="1.4", + org.apache.tuscany.sca.workspace.builder;version="1.4" Bundle-SymbolicName: org.apache.tuscany.sca.workspace Bundle-DocURL: http://www.apache.org/ Modified: tuscany/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF (original) +++ tuscany/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF Thu Oct 30 21:01:44 2008 @@ -15,15 +15,23 @@ Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA XSD XML Processor -Import-Package: javax.xml.namespace,javax.xml.stream,org.apache.tuscan - y.sca.contribution;version="1.4",org.apache.tuscany.sca.contribution. - namespace;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 - .monitor;version="1.4",org.apache.tuscany.sca.xsd;version="1.4",org.a - pache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.commons.schema, - org.apache.ws.commons.schema.resolver,org.w3c.dom,org.xml.sax,org.jun - it;resolution:=optional,junit.framework;resolution:=optional +Import-Package: javax.xml.namespace, + javax.xml.stream, + junit.framework;resolution:=optional, + org.apache.tuscany.sca.assembly;version="1.4.0", + org.apache.tuscany.sca.contribution;version="1.4", + org.apache.tuscany.sca.contribution.namespace;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.monitor;version="1.4", + org.apache.tuscany.sca.xsd;version="1.4", + org.apache.tuscany.sca.xsd.xml;version="1.4", + org.apache.ws.commons.schema, + org.apache.ws.commons.schema.resolver, + org.junit;resolution:=optional, + org.w3c.dom, + org.xml.sax Bundle-SymbolicName: org.apache.tuscany.sca.xsd.xml Bundle-DocURL: http://www.apache.org/ Modified: tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java?rev=709339&r1=709338&r2=709339&view=diff ============================================================================== --- tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java (original) +++ tuscany/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java Thu Oct 30 21:01:44 2008 @@ -32,7 +32,6 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition;
