From 64fa14787b2b4b7b30756a360a34a55631e592f6 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 16 Mar 2012 08:20:24 +0000
Subject: TUSCANY-4028 - don't duplicate intents on the Java implementation
 model

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1301369 13f79535-47bb-0310-9956-ffa450edef68
---
 .../performance/impl/HelloworldServiceImpl.java    |  6 +++-
 .../src/main/resources/LoggingMessages.properties  | 16 +++++++++
 .../src/main/resources/META-INF/definitions.xml    | 41 ++++++++++++++++++++++
 .../src/main/resources/PerformanceTest.composite   |  3 +-
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/LoggingMessages.properties
 create mode 100644 sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/META-INF/definitions.xml

(limited to 'sca-java-2.x/trunk/testing/itest/performance/performance-contribution1')

diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/java/org/apache/tuscany/sca/test/performance/impl/HelloworldServiceImpl.java b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/java/org/apache/tuscany/sca/test/performance/impl/HelloworldServiceImpl.java
index c0d926b577..ea748d0d46 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/java/org/apache/tuscany/sca/test/performance/impl/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/java/org/apache/tuscany/sca/test/performance/impl/HelloworldServiceImpl.java
@@ -20,11 +20,15 @@ package org.apache.tuscany.sca.test.performance.impl;
 
 import org.apache.tuscany.sca.test.performance.BeanA;
 import org.apache.tuscany.sca.test.performance.Helloworld;
+import org.oasisopen.sca.annotation.Requires;
 
+@Requires("{http://tuscany.apache.org/xmlns/sca/1.1}logging")
 public class HelloworldServiceImpl implements Helloworld {
 
     public String sayHello(String name, BeanA beanA) {
-        return "Hello " + name + " " + beanA.getField1();
+        String returnStrng =  "Hello " + name + " " + beanA.getField1();
+        System.out.println("At HelloworldServiceImpl - " + returnStrng);
+        return returnStrng;
     }
 
 }
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/LoggingMessages.properties b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/LoggingMessages.properties
new file mode 100644
index 0000000000..09c0e7565d
--- /dev/null
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/LoggingMessages.properties
@@ -0,0 +1,16 @@
+# 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. 
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/META-INF/definitions.xml
new file mode 100644
index 0000000000..e5ad11087b
--- /dev/null
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/META-INF/definitions.xml
@@ -0,0 +1,41 @@
+<?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/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
+    
+    <intent name="mediation" constrains="sca:binding"/>
+    
+    <policySet name="Mediation1" 
+               provides="tuscany:mediation" 
+               appliesTo="//sca:service"
+               attachTo="//sca:component[@name='BusinessLogicComponent']">
+        <tuscany:mediation name="mediation1.med"/>
+    </policySet>
+    
+    <policySet name="Mediation2" 
+               provides="tuscany:mediation" 
+               appliesTo="//sca:reference"
+               attachTo="//sca:component[@name='BusinessLogicComponent']">
+        <tuscany:mediation name="mediation2.med"/>
+    </policySet>    
+         	              
+</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/PerformanceTest.composite b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/PerformanceTest.composite
index 000015246d..a631baf8c5 100644
--- a/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/PerformanceTest.composite
+++ b/sca-java-2.x/trunk/testing/itest/performance/performance-contribution1/src/main/resources/PerformanceTest.composite
@@ -20,6 +20,7 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
            xmlns:foo="http://foo" 
            targetNamespace="http://foo"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
   name="PerformanceTest">
   
   <component name="HelloWorldClientComponent">
@@ -28,7 +29,7 @@
   </component>
 
   <component name="HelloWorldServiceComponent">
-    <implementation.java class="org.apache.tuscany.sca.test.performance.impl.HelloworldServiceImpl" />
+    <implementation.java class="org.apache.tuscany.sca.test.performance.impl.HelloworldServiceImpl"/>
     <service name="Helloworld">
         <binding.ws/>
     </service>
-- 
cgit v1.2.3