Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java Thu Mar 5 05:52:01 2009 @@ -26,7 +26,7 @@ * @version $Rev$ $Date$ */ public class JaasAuthenticationPolicy { - private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; public static final QName NAME = new QName(SCA10_TUSCANY_NS, "jaasAuthentication"); private String configurationName = "other";
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java Thu Mar 5 05:52:01 2009 @@ -32,7 +32,7 @@ */ public class JaasAuthenticationPolicyHandler { private static final String jaasPolicy = "JaasPolicy"; - private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, jaasPolicy); private PolicySet applicablePolicySet = null; Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java Thu Mar 5 05:52:01 2009 @@ -44,7 +44,7 @@ public class JaasAuthenticationPolicyProcessor implements StAXArtifactProcessor<JaasAuthenticationPolicy> { private static final QName JAAS_AUTHENTICATION_POLICY_QNAME = JaasAuthenticationPolicy.NAME; private static final String callbackHandler = "callbackHandler"; - private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; 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; Modified: tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original) +++ tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009 @@ -16,12 +16,12 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy -org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy -org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy -org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy -org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy -org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy -org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy -org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy -org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#basicAuthentication,model=org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy +org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy +org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy +org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy +org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy +org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy +org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy +org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy +org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy +org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#basicAuthentication,model=org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy Modified: tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml (original) +++ tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml Thu Mar 5 05:52:01 2009 @@ -20,7 +20,7 @@ <definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"; xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"; - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";> + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";> <!-- POLICY SETS --> <policySet name="runAs" appliesTo="sca:implementation.java"/> Modified: tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml (original) +++ tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml Thu Mar 5 05:52:01 2009 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"; - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"; xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";> +<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"; + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"; xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";> <intent name="identity" constrains="sca:implementation.java sca:implementation.spring"> Modified: tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java (original) +++ tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java Thu Mar 5 05:52:01 2009 @@ -43,7 +43,7 @@ * @version $Rev$ $Date$ */ public class PolicyProcessorTestCase { - private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";; + private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";; private final static List<String> SEQ = Arrays.asList("permitAll", "allow [r1, r2]", @@ -61,10 +61,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(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)); + processors.put(new QName(SCA11_NS, "allow"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA11_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA11_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null)); + processors.put(new QName(SCA11_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/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml (original) +++ tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml Thu Mar 5 05:52:01 2009 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"; targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"; - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";> +<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"; + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712";> <!-- POLICY SETS --> <policySet name="ps1" provides="authorization" appliesTo="sca:implementation"> Modified: tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java (original) +++ tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java Thu Mar 5 05:52:01 2009 @@ -40,15 +40,15 @@ private static final String VALID_WS_POLICY = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - + "<definitions xmlns=\"http://www.osoa.org/xmlns/sca/1.0\""; + + "<definitions xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\""; + " targetNamespace=\"http://test\""; + " xmlns:test=\"http://test\""; - + " xmlns:sca=\"http://www.osoa.org/xmlns/sca/1.0\";>" + + " xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\";>" + " " + " <policySet name=\"SecureWSPolicy\"" + " provides=\"test:confidentiality\"" + " appliesTo=\"sca:binding.ws\"" - + " xmlns=\"http://www.osoa.org/xmlns/sca/1.0\""; + + " xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\""; + " xmlns:sp=\"http://schemas.xmlsoap.org/ws/2002/12/secext\""; + " xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>" + " <wsp:Policy>" Modified: tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java (original) +++ tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java Thu Mar 5 05:52:01 2009 @@ -29,7 +29,7 @@ String WHITE_SPACE = " "; String COLON = ":"; String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";; - String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; String INTENT = "intent"; String POLICY_SET = "policySet"; String POLICY_SET_REFERENCE = "policySetReference"; Modified: tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java (original) +++ tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java Thu Mar 5 05:52:01 2009 @@ -63,7 +63,7 @@ */ public class PolicyComputationUtils { private static final String POLICYSET_PREFIX = "tp_"; - private static final String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; private static final String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets"; private static final String POLICY_SETS_ATTR = "policySets"; private static final String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany"; Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java (original) +++ tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java Thu Mar 5 05:52:01 2009 @@ -14,7 +14,7 @@ /** * Namespace for intents. */ - String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0";; + String SCA_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";; /** * Prefix form of the namespace that can be prepended to intent declarations. Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java (original) +++ tuscany/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java Thu Mar 5 05:52:01 2009 @@ -25,8 +25,8 @@ * {...@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more * suffixes separated by a "." such as: * <ul> - * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality</li> - * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality.message</li> + * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200712}confidentiality</li> + * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200712}confidentiality.message</li> * </ul> * This annotation supports general purpose intents specified as strings. Users may also define * specific intents using the {...@link @org.oasisopen.sca.annotation.Intent} annotation. Modified: tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java (original) +++ tuscany/java/sca/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java Thu Mar 5 05:52:01 2009 @@ -49,7 +49,7 @@ */ public class WorkspaceProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Workspace> { - private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";; + private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";; private static final QName WORKSPACE_QNAME = new QName(SCA10_TUSCANY_NS, "workspace"); private static final QName CONTRIBUTION_QNAME = new QName(SCA10_TUSCANY_NS, "contribution"); private static final String URI = "uri"; Modified: tuscany/java/sca/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original) +++ tuscany/java/sca/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Mar 5 05:52:01 2009 @@ -16,4 +16,4 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.workspace.xml.WorkspaceProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#workspace,model=org.apache.tuscany.sca.workspace.Workspace +org.apache.tuscany.sca.workspace.xml.WorkspaceProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#workspace,model=org.apache.tuscany.sca.workspace.Workspace Modified: tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java (original) +++ tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java Thu Mar 5 05:52:01 2009 @@ -48,13 +48,13 @@ public class ContributionWorkspaceProcessorTestCase { private static final String VALID_XML = - "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\";>" + "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\";>" + "<contribution uri=\"uri1\" location=\"location1\"/>" + "<contribution uri=\"uri2\" location=\"location2\"/>" + "</workspace>"; private static final String INVALID_XML = - "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\";>" + "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\";>" + "<contribution uri=\"uri1\" location=\"location1\"/>" + "<contribution uri=\"uri2\" location=\"location2\"/>" + "</contribution>" Modified: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite (original) +++ tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml (original) +++ tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009 @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"; - xmlns:sample="http://sample";> - <deployable composite="sample:Calculator"/> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; + xmlns:sample="http://sample";> + <deployable composite="sample:Calculator"/> </contribution> \ No newline at end of file Modified: tuscany/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite (original) +++ tuscany/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite (original) +++ tuscany/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/calculator-rmi-reference/build.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/build.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-rmi-reference/build.xml (original) +++ tuscany/java/sca/samples/calculator-rmi-reference/build.xml Thu Mar 5 05:52:01 2009 @@ -61,8 +61,22 @@ <arg value="unmanaged"/> <arg value="target/${jar.name}"/> </java> - </target> - + </target> + + <!-- We need to add a client component to trigger the calculation --> + <target name="run-equinox" depends="compile"> + <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true"> + <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/> + <arg value="-composite"/> + <arg value="CalculatorRMIReference.composite"/> + <arg value="-config"/> + <arg value="../../features/configuration"/> + <arg value="-ttl"/> + <arg value="0"/> + <arg value="target/${jar.name}"/> + </java> + </target> + </project> Modified: tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite (original) +++ tuscany/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite Thu Mar 5 05:52:01 2009 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite (original) +++ tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite Thu Mar 5 05:52:01 2009 @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml (original) +++ tuscany/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; xmlns:sample="http://sample";> <deployable composite="sample:Calculator"/> </contribution> \ No newline at end of file Modified: tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite (original) +++ tuscany/java/sca/samples/calculator/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator"> Modified: tuscany/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml (original) +++ tuscany/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; xmlns:sample="http://sample";> <deployable composite="sample:Calculator"/> </contribution> \ No newline at end of file Modified: tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite?rev=750323&r1=750322&r2=750323&view=diff ============================================================================== --- tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite (original) +++ tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite Thu Mar 5 05:52:01 2009 @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"; targetNamespace="http://sample"; xmlns:sample="http://sample"; name="Calculator">
