Author: rfeng
Date: Thu Jul 9 17:11:31 2009
New Revision: 792609
URL: http://svn.apache.org/viewvc?rev=792609&view=rev
Log:
Update the dependency and change the namespace
Added:
tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/Logging.java
Removed:
tuscany/java/sca/modules/policy-logging/src/main/resources/META-INF/definitions.xml
Modified:
tuscany/java/sca/modules/policy-logging/META-INF/MANIFEST.MF
tuscany/java/sca/modules/policy-logging/pom.xml
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
tuscany/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
tuscany/java/sca/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
Modified: tuscany/java/sca/modules/policy-logging/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/META-INF/MANIFEST.MF?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-logging/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/policy-logging/META-INF/MANIFEST.MF Thu Jul 9
17:11:31 2009
@@ -22,7 +22,8 @@
org.apache.tuscany.sca.monitor;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0"
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.oasisopen.sca.annotation
Bundle-SymbolicName: org.apache.tuscany.sca.policy.logging
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/java/sca/modules/policy-logging/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/pom.xml?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-logging/pom.xml (original)
+++ tuscany/java/sca/modules/policy-logging/pom.xml Thu Jul 9 17:11:31 2009
@@ -38,6 +38,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
(original)
+++
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
Thu Jul 9 17:11:31 2009
@@ -22,6 +22,8 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.assembly.Base;
+
/**
* Implementation for policies that could be injected as parameter
* into the axis2config.
@@ -29,9 +31,9 @@
* @version $Rev$ $Date$
*/
public class JDKLoggingPolicy {
- static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
- static final String SCA10_TUSCANY_NS =
"http://tuscany.apache.org/xmlns/sca/1.0";;
- private static final QName JDK_LOGGING_POLICY_QNAME = new
QName(SCA10_TUSCANY_NS, "jdkLogger");
+ static final String SCA11_NS = Base.SCA11_NS;
+ static final String SCA11_TUSCANY_NS = Base.SCA11_TUSCANY_NS;
+ private static final QName JDK_LOGGING_POLICY_QNAME = new
QName(SCA11_TUSCANY_NS, "jdkLogger");
private String loggerName;
private String resourceBundleName;
Modified:
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
(original)
+++
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
Thu Jul 9 17:11:31 2009
@@ -39,7 +39,7 @@
*/
public class JDKLoggingPolicyInterceptor implements PhasedInterceptor {
public static final String loggingPolicy = "JDKLoggingPolicy";
- public static final QName policySetQName = new
QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, loggingPolicy);
+ public static final QName policySetQName = new
QName(JDKLoggingPolicy.SCA11_TUSCANY_NS, loggingPolicy);
private Logger logger = null;
private Invoker next;
Modified:
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
(original)
+++
tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
Thu Jul 9 17:11:31 2009
@@ -41,12 +41,11 @@
* @version $Rev$ $Date$
*/
public class JDKLoggingPolicyProcessor implements
StAXArtifactProcessor<JDKLoggingPolicy> {
- private static final QName JDK_LOGGING_POLICY_QNAME = new
QName(JDKLoggingPolicy.SCA10_TUSCANY_NS, "jdkLogger");
+ private static final QName JDK_LOGGING_POLICY_QNAME = new
QName(JDKLoggingPolicy.SCA11_TUSCANY_NS, "jdkLogger");
private static final String LOG_LEVEL = "logLevel";
private static final String RESOURCE_BUNDLE = "resourceBundle";
private static final String USE_PARENT_HANDLERS = "useParentHandlers";
- private static final String TUSACNY_NS =
"http://tuscany.apache.org/xmlns/sca/1.0";;
-
+
public QName getArtifactType() {
return JDK_LOGGING_POLICY_QNAME;
}
@@ -101,7 +100,7 @@
writer.writeStartElement(prefix,
JDK_LOGGING_POLICY_QNAME.getLocalPart(),
JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
- writer.writeNamespace("tuscany", JDKLoggingPolicy.SCA10_TUSCANY_NS);
+ writer.writeNamespace("tuscany", JDKLoggingPolicy.SCA11_TUSCANY_NS);
if (policy.getLoggerName() != null) {
writer.writeAttribute("name", policy.getLoggerName());
Modified:
tuscany/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
(original)
+++
tuscany/java/sca/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
Thu Jul 9 17:11:31 2009
@@ -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
Added:
tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/Logging.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/Logging.java?rev=792609&view=auto
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/Logging.java
(added)
+++
tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/Logging.java
Thu Jul 9 17:11:31 2009
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.policy.logging;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.apache.tuscany.sca.assembly.Base;
+import org.oasisopen.sca.annotation.Intent;
+import org.oasisopen.sca.annotation.Qualifier;
+
+...@inherited
+...@target({TYPE, FIELD, METHOD, PARAMETER})
+...@retention(RUNTIME)
+...@intent(Logging.LOGGING)
+
+public @interface Logging {
+ String LOGGING = "{"+Base.SCA11_TUSCANY_NS + "}logging";
+
+ @Qualifier
+ String[] value() default "";
+}
Modified:
tuscany/java/sca/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml?rev=792609&r1=792608&r2=792609&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
(original)
+++
tuscany/java/sca/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
Thu Jul 9 17:11:31 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<tuscany:jdkLogger xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
name="test.logger">
+<tuscany:jdkLogger xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
name="test.logger">
<logLevel>INFO</logLevel>
<resourceBundle>Trace_Messages.properties</resourceBundle>
</tuscany:jdkLogger>
\ No newline at end of file
