Fix the namespace version and remove the policySet

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

2 files changed, 3 insertions, 14 deletions

diff --git a/java/sca/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..910d57dbfc 100644
--- a/java/sca/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jdkLogger,model=org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy
+org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#jdkLogger,model=org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy
diff --git a/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index d168775f31..84d7bfc36f 100644
--- a/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
@@ -18,24 +18,13 @@
  * under the License.    

 -->

 <definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"

-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">

+            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1">

 

 	<!-- Policy Intents Defined by the SCA Runtime -->

-	<intent name="logging" constrains="sca:implementation sca:binding">

+	<intent name="logging" constrains="implementation binding">

 		<description>

 			All messages to and from this implementation must be logged

 		</description>

 	</intent>

     

-    <policySet name="JDKLoggingPolicy" 

-               provides="tuscany:logging" 

-               appliesTo="sca:binding sca:implementation">

-        <tuscany:jdkLogger name="test.logger">

-            <tuscany:logLevel>INFO</tuscany:logLevel>

-            <tuscany:resourceBundle>Trace_Messages.properties</tuscany:resourceBundle>

-        </tuscany:jdkLogger>

-    </policySet>

-    

 </definitions>
\ No newline at end of file