Update the dependency and change the namespace

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

2 files changed, 15 insertions, 36 deletions

diff --git a/java/sca/modules/policy-logging/src/main/resources/META-INF/definitions.xml b/java/sca/modules/policy-logging/src/main/resources/META-INF/definitions.xml
deleted file mode 100644
index 46e6d4490a..0000000000
--- a/java/sca/modules/policy-logging/src/main/resources/META-INF/definitions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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.    

--->

-<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">

-

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

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

-		<description>

-			All messages to and from this implementation must be logged

-		</description>

-	</intent>

-</definitions>
\ No newline at end of file
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 956a8983a2..d168775f31 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
@@ -17,15 +17,25 @@
  * 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"

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

+<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">

 

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

-	<intent name="logging" constrains="sca:implementation.java sca:implementation.spring">

+	<intent name="logging" constrains="sca:implementation sca: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