Author: rfeng
Date: Wed Oct 24 14:11:07 2007
New Revision: 588025
URL: http://svn.apache.org/viewvc?rev=588025&view=rev
Log:
Merge the changes from trunk r588014 & r588015
Removed:
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/binding-rmi/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/binding-ws-xml/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/binding-ws/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-impl/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-java/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-namespace/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution-osgi/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/contribution/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/core-databinding/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/core-spi/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/core/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-axiom/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-jaxb/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-json/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-sdo-axiom/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-sdo/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding-xmlbeans/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/databinding/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/host-embedded/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/host-jetty/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/host-tomcat/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-java-runtime/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-java-xml/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-java/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/implementation-spring/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/interface-java-xml/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/interface-java/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/interface-wsdl-xml/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/interface-wsdl/.ruleset
incubator/tuscany/branches/sca-java-1.0.1/modules/interface/.ruleset
Modified:
incubator/tuscany/branches/sca-java-1.0.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/CalculatorLogMessages.properties
Modified:
incubator/tuscany/branches/sca-java-1.0.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java?rev=588025&r1=588024&r2=588025&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
(original)
+++
incubator/tuscany/branches/sca-java-1.0.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
Wed Oct 24 14:11:07 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.jdk;
@@ -7,9 +25,6 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicy;
-import org.apache.tuscany.sca.policy.logging.jdk.JDKLoggingPolicyProcessor;
import junit.framework.TestCase;
Modified:
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/CalculatorLogMessages.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/CalculatorLogMessages.properties?rev=588025&r1=588024&r2=588025&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/CalculatorLogMessages.properties
(original)
+++
incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/CalculatorLogMessages.properties
Wed Oct 24 14:11:07 2007
@@ -1,2 +1,18 @@
+# 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.
CALLING_OPERATION=Inovoking operation {0} with arguments {1}
OPERATION_RETURNED=Returning from operation {0} with return value {1}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
