diff options
7 files changed, 82 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java index e32171a0ee..4b2f32c4c2 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java @@ -1106,7 +1106,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt //for this that is resolved, the specified intents and policysets are safe in the //component and not lost - List<PolicySet> policySets = new ArrayList<PolicySet>(implementation.getPolicySets()); + List<PolicySet> policySets = new ArrayList<PolicySet>(implementation.getPolicySets()); List<Intent> intents = new ArrayList<Intent>(implementation.getRequiredIntents()); implementation = resolveImplementation(implementation, resolver, context); @@ -1117,7 +1117,15 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt implementation.getPolicySets().addAll(policySets); } - implementation.getRequiredIntents().addAll(intents); + //implementation.getRequiredIntents().addAll(intents); + + // Make sure we don't repeat any intents that are already on the + // resolved implementation + for (Intent intent : intents){ + if (!implementation.getRequiredIntents().contains(intent)){ + implementation.getRequiredIntents().add(intent); + } + } // resolve any policy on implementation operations for (Operation op : implementation.getOperations()){ 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>
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml b/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml index e1de9fef85..73990136d5 100644 --- a/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/performance/performance-test/pom.xml @@ -46,6 +46,12 @@ <artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-logging</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java b/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java index 454ad9dad8..329eea6a3d 100644 --- a/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/performance/performance-test/src/test/java/org/apache/tuscany/sca/test/performance/PerformanceTestCase.java @@ -224,11 +224,11 @@ public class PerformanceTestCase { System.out.println("You can watch a JVM run using \n" +
" jconsole \n" +
"You can manually dump the heap using \n" +
- " jmap -dump:file=heapdump.bin 345" +
+ " jmap -dump:file=heap_stop_" + name + ".bin 345" +
"Where 345 is the process id from jconsole \n" +
"The program dumps the heap at the start and end. You can look at them using \n" +
" jhat -J-Xmx512m heap_start.bin\n" +
- " jhat -J-Xmx512m heap_stop.bin\n" +
+ " jhat -J-Xmx512m heap_stop_" + name + ".bin\n" +
"Then point your browser at\n" +
" http://localhost:7000/");
} else {
|