From f605582ee7cd2332df50d50641d1a795f5bb6b54 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 12 Feb 2010 06:35:53 +0000 Subject: Renaming itest git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@909257 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-2.x/itest/binding-throughput/pom.xml | 168 +++++++++++++++++++++ .../src/main/java/services/Catalog.java | 27 ++++ .../src/main/java/services/Item.java | 50 ++++++ .../java/services/sca/CatalogAggregatorImpl.java | 56 +++++++ .../main/java/services/sca/FruitsCatalogImpl.java | 30 ++++ .../java/services/sca/VegetablesCatalogImpl.java | 46 ++++++ .../tuscany/sca/performance/CatalogLocalTest.java | 52 +++++++ .../sca/performance/CatalogRemoteJsonRPCTest.java | 48 ++++++ .../sca/performance/CatalogRemoteWsTest.java | 48 ++++++ .../tuscany/sca/performance/LoadTestCase.java | 129 ++++++++++++++++ .../src/test/resources/catalog-local.composite | 51 +++++++ .../resources/catalog-remote-jsonrpc.composite | 55 +++++++ .../src/test/resources/catalog-remote-ws.composite | 55 +++++++ .../src/test/resources/log4j.properties | 28 ++++ .../src/test/resources/logging.properties | 37 +++++ sandbox/lresende/sca-2.x/itest/performance/pom.xml | 168 --------------------- .../src/main/java/services/Catalog.java | 27 ---- .../performance/src/main/java/services/Item.java | 50 ------ .../java/services/sca/CatalogAggregatorImpl.java | 56 ------- .../main/java/services/sca/FruitsCatalogImpl.java | 30 ---- .../java/services/sca/VegetablesCatalogImpl.java | 46 ------ .../tuscany/sca/performance/CatalogLocalTest.java | 52 ------- .../sca/performance/CatalogRemoteJsonRPCTest.java | 48 ------ .../sca/performance/CatalogRemoteWsTest.java | 48 ------ .../tuscany/sca/performance/LoadTestCase.java | 129 ---------------- .../src/test/resources/catalog-local.composite | 51 ------- .../resources/catalog-remote-jsonrpc.composite | 55 ------- .../src/test/resources/catalog-remote-ws.composite | 55 ------- .../src/test/resources/log4j.properties | 28 ---- .../src/test/resources/logging.properties | 37 ----- 30 files changed, 880 insertions(+), 880 deletions(-) create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/pom.xml create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Catalog.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Item.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/CatalogAggregatorImpl.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/FruitsCatalogImpl.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/VegetablesCatalogImpl.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/log4j.properties create mode 100644 sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/logging.properties delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/pom.xml delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Catalog.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Item.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/CatalogAggregatorImpl.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/FruitsCatalogImpl.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/VegetablesCatalogImpl.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-local.composite delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-jsonrpc.composite delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-ws.composite delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/resources/log4j.properties delete mode 100644 sandbox/lresende/sca-2.x/itest/performance/src/test/resources/logging.properties diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/pom.xml b/sandbox/lresende/sca-2.x/itest/binding-throughput/pom.xml new file mode 100644 index 0000000000..e7017b7e40 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/pom.xml @@ -0,0 +1,168 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + ../pom.xml + + + itest-binding-throughput + Apache Tuscany SCA Binding Throughput Scenarios + + + + org.apache.tuscany.sca + tuscany-feature-api + pom + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-feature-core + pom + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-feature-webservice + pom + 2.0-SNAPSHOT + + + + + + org.apache.tuscany.sca + tuscany-binding-jsonrpc-runtime + 2.0-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-host-jetty + 2.0-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-monitor + 2.0-SNAPSHOT + test + + + + junitperf + junitperf + 1.8 + + + + junit + junit + 4.8.1 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + log4j.configuration + log4j.properties + + + java.util.logging.config.file + logging.properties + + + + + + + diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Catalog.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Catalog.java new file mode 100644 index 0000000000..b5e504fe11 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Catalog.java @@ -0,0 +1,27 @@ +/* + * 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 services; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Catalog { + Item[] get(); +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Item.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Item.java new file mode 100644 index 0000000000..04110cdc13 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/Item.java @@ -0,0 +1,50 @@ +/* + * 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 services; + +public class Item { + private String name; + private double price; + + public Item() { + } + + public Item(String name, double price) { + this.name = name; + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/CatalogAggregatorImpl.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/CatalogAggregatorImpl.java new file mode 100644 index 0000000000..6999106ab9 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/CatalogAggregatorImpl.java @@ -0,0 +1,56 @@ +/* + * 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 services.sca; + +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; + +import services.Catalog; +import services.Item; + +@Service(Catalog.class) +@Scope("COMPOSITE") +public class CatalogAggregatorImpl implements Catalog { + + @Reference + public Catalog fruitsCatalog; + + @Reference + public Catalog vegetablesCatalog; + + public Item[] get() { + Item[] fruits = fruitsCatalog.get(); + Item[] vegetables = vegetablesCatalog.get(); + + Item[] catalog = new Item[fruits.length + vegetables.length]; + int i =0; + for (Item item: fruits) { + catalog[i++] = item; + } + + for (Item item: vegetables) { + catalog[i++] = item; + } + + return catalog; + } + +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/FruitsCatalogImpl.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/FruitsCatalogImpl.java new file mode 100644 index 0000000000..b4c78a6ab4 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/FruitsCatalogImpl.java @@ -0,0 +1,30 @@ +package services.sca; + +import java.util.ArrayList; +import java.util.List; + +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; + +import services.Catalog; +import services.Item; + +@Service(Catalog.class) +@Scope("COMPOSITE") +public class FruitsCatalogImpl implements Catalog { + private List catalog = new ArrayList(); + + @Init + public void init() { + catalog.add(new Item("Apple", 2.99)); + catalog.add(new Item("Orange", 3.55)); + catalog.add(new Item("Pear", 1.55)); + } + + public Item[] get() { + Item[] catalogArray = new Item[catalog.size()]; + catalog.toArray(catalogArray); + return catalogArray; + } +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/VegetablesCatalogImpl.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/VegetablesCatalogImpl.java new file mode 100644 index 0000000000..06d13b3804 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/main/java/services/sca/VegetablesCatalogImpl.java @@ -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 services.sca; + +import java.util.ArrayList; +import java.util.List; + +import org.oasisopen.sca.annotation.Init; + +import services.Catalog; +import services.Item; + +public class VegetablesCatalogImpl implements Catalog { + + private List catalog = new ArrayList(); + + @Init + public void init() { + catalog.add(new Item("Broccoli", 2.99)); + catalog.add(new Item("Asparagus", 3.55)); + catalog.add(new Item("Cauliflower", 1.55)); + } + + public Item[] get() { + Item[] catalogArray = new Item[catalog.size()]; + catalog.toArray(catalogArray); + return catalogArray; + } +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java new file mode 100644 index 0000000000..9914995e04 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java @@ -0,0 +1,52 @@ +/* + * 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.performance; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.node.Node; +import org.junit.Assert; +import org.junit.Test; + +import services.Catalog; + +/** + * @version $Rev$ $Date$ + */ +public class CatalogLocalTest extends TestCase { + public static String COMPOSITE = "catalog-local.composite"; + + private Node node; + + public CatalogLocalTest() { + super(); + } + + public CatalogLocalTest(String name, Node node) { + super(name); + this.node = node; + } + + @Test + public void testCatalog() throws Exception { + Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); + Assert.assertEquals(6, catalogService.get().length); + } +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java new file mode 100644 index 0000000000..cfebd1c52b --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java @@ -0,0 +1,48 @@ +/* + * 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.performance; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.node.Node; +import org.junit.Assert; +import org.junit.Test; + +import services.Catalog; + +/** + * @version $Rev$ $Date$ + */ +public class CatalogRemoteJsonRPCTest extends TestCase { + public static String COMPOSITE = "catalog-remote-jsonrpc.composite"; + + private Node node; + + public CatalogRemoteJsonRPCTest(String name, Node node) { + super(name); + this.node = node; + } + + @Test + public void testCatalog() throws Exception { + Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); + Assert.assertEquals(6, catalogService.get().length); + } +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java new file mode 100644 index 0000000000..075789a327 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java @@ -0,0 +1,48 @@ +/* + * 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.performance; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.node.Node; +import org.junit.Assert; +import org.junit.Test; + +import services.Catalog; + +/** + * @version $Rev$ $Date$ + */ +public class CatalogRemoteWsTest extends TestCase { + public static String COMPOSITE = "catalog-remote-ws.composite"; + + private Node node; + + public CatalogRemoteWsTest(String name, Node node) { + super(name); + this.node = node; + } + + @Test + public void testCatalog() throws Exception { + Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); + Assert.assertEquals(6, catalogService.get().length); + } +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java new file mode 100644 index 0000000000..57648a7137 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java @@ -0,0 +1,129 @@ +/* + * 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.performance; + +import java.text.NumberFormat; +import java.util.concurrent.TimeUnit; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.Test; + +import com.clarkware.junitperf.ConstantTimer; +import com.clarkware.junitperf.LoadTest; +import com.clarkware.junitperf.Timer; + +public class LoadTestCase { + private static int USERS = 50; + private static int ITERATIONS = 10; + private static Timer TIMER = new ConstantTimer(10); + + protected static synchronized Node initializeTuscanyRuntime(String composite) { + System.out.println(">>> initializing Tuscany Runtime...."); + + /* + Node node = null; + + NodeFactory factory = NodeFactory.getInstance(); + + String location = ContributionLocationHelper.getContributionLocation(LoadTestCase.class); + + ContributionConfiguration contributionConfiguration = + factory.createContributionConfiguration() + .addDeploymentComposite(composite) + .setURI("c") + .setLocation(location); + + NodeConfiguration configuration = + factory.createNodeConfiguration() + //.setDomainURI("tuscany:performance") + .addContribution(contributionConfiguration); + + node = factory.createNode(configuration); + node.start(); + */ + + /**/ + long startTime = 0; + long endTime = 0; + long duration = 0; + + Node node = null; + + startTime = System.nanoTime(); + + String location = ContributionLocationHelper.getContributionLocation(LoadTestCase.class); + node = NodeFactory.newInstance().createNode(composite, new Contribution("c", location)); + node.start(); + + endTime = System.nanoTime(); + duration = TimeUnit.MILLISECONDS.convert(endTime - startTime, TimeUnit.NANOSECONDS); + + System.out.println(">>> >>> Runtime initialization: " + + NumberFormat.getInstance().format(duration) + " ms"); + + /**/ + + return node; + } + + public static junit.framework.Test localTests() { + System.out.println("#### Local Tests"); + Node node = initializeTuscanyRuntime(CatalogLocalTest.COMPOSITE); + junit.framework.Test testCase = new CatalogLocalTest("testCatalog", node); + junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); + //node.stop(); + return loadTest; + } + + public static junit.framework.Test jsonTests() { + System.out.println("#### JSON-RPC Remote Tests"); + Node node = initializeTuscanyRuntime(CatalogRemoteJsonRPCTest.COMPOSITE); + junit.framework.Test testCase = new CatalogRemoteJsonRPCTest("testCatalog", node); + junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); + //node.stop(); + return loadTest; + } + + public static junit.framework.Test wsTests() { + System.out.println("#### WS Remote Tests"); + Node node = initializeTuscanyRuntime(CatalogRemoteWsTest.COMPOSITE); + junit.framework.Test testCase = new CatalogRemoteJsonRPCTest("testCatalog", node ); + junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); + //node.stop(); + return loadTest; + } + + @Test + public void run() throws Exception { + junit.textui.TestRunner.run(localTests()); + junit.textui.TestRunner.run(jsonTests()); + junit.textui.TestRunner.run(wsTests()); + } + + + public static void main(String[] args) throws Exception { + LoadTestCase loadTest = new LoadTestCase(); + loadTest.run(); + } + +} diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite new file mode 100644 index 0000000000..707bc5ae32 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite new file mode 100644 index 0000000000..545b9d7b10 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite new file mode 100644 index 0000000000..5ad7789e84 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/log4j.properties b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/log4j.properties new file mode 100644 index 0000000000..05e7450068 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/log4j.properties @@ -0,0 +1,28 @@ +# +# +# 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. +# +# + +# Configure the console as our one appender +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n + +#tuscany debug messages +log4j.category.org.apache.tuscany=DEBUG,A1 diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/logging.properties b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/logging.properties new file mode 100644 index 0000000000..d7f03147b2 --- /dev/null +++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/logging.properties @@ -0,0 +1,37 @@ +# +# +# 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. +# +# +# A default java.util.logging configuration. +# (All App Engine logging is through java.util.logging by default). +# +# To use this configuration, copy it into your application's WEB-INF +# folder and add the following to your appengine-web.xml: +# +# +# +# +# + +# Set the default logging level for all loggers to WARNING +.level = DEBUG + +#tuscany debug messages +org.apache.tuscany.level = DEBUG + diff --git a/sandbox/lresende/sca-2.x/itest/performance/pom.xml b/sandbox/lresende/sca-2.x/itest/performance/pom.xml deleted file mode 100644 index 4c5bdd20de..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - - itest-performance - Apache Tuscany SCA Performance Driver - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-core - pom - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-feature-webservice - pom - 2.0-SNAPSHOT - - - - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc-runtime - 2.0-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-monitor - 2.0-SNAPSHOT - test - - - - junitperf - junitperf - 1.8 - - - - junit - junit - 4.8.1 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - log4j.properties - - - java.util.logging.config.file - logging.properties - - - - - - - diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Catalog.java b/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Catalog.java deleted file mode 100644 index b5e504fe11..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Catalog.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Catalog { - Item[] get(); -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Item.java b/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Item.java deleted file mode 100644 index 04110cdc13..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/Item.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 services; - -public class Item { - private String name; - private double price; - - public Item() { - } - - public Item(String name, double price) { - this.name = name; - this.price = price; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getPrice() { - return price; - } - - public void setPrice(double price) { - this.price = price; - } - -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/CatalogAggregatorImpl.java b/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/CatalogAggregatorImpl.java deleted file mode 100644 index 6999106ab9..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/CatalogAggregatorImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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 services.sca; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -import services.Catalog; -import services.Item; - -@Service(Catalog.class) -@Scope("COMPOSITE") -public class CatalogAggregatorImpl implements Catalog { - - @Reference - public Catalog fruitsCatalog; - - @Reference - public Catalog vegetablesCatalog; - - public Item[] get() { - Item[] fruits = fruitsCatalog.get(); - Item[] vegetables = vegetablesCatalog.get(); - - Item[] catalog = new Item[fruits.length + vegetables.length]; - int i =0; - for (Item item: fruits) { - catalog[i++] = item; - } - - for (Item item: vegetables) { - catalog[i++] = item; - } - - return catalog; - } - -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/FruitsCatalogImpl.java b/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/FruitsCatalogImpl.java deleted file mode 100644 index b4c78a6ab4..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/FruitsCatalogImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package services.sca; - -import java.util.ArrayList; -import java.util.List; - -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -import services.Catalog; -import services.Item; - -@Service(Catalog.class) -@Scope("COMPOSITE") -public class FruitsCatalogImpl implements Catalog { - private List catalog = new ArrayList(); - - @Init - public void init() { - catalog.add(new Item("Apple", 2.99)); - catalog.add(new Item("Orange", 3.55)); - catalog.add(new Item("Pear", 1.55)); - } - - public Item[] get() { - Item[] catalogArray = new Item[catalog.size()]; - catalog.toArray(catalogArray); - return catalogArray; - } -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/VegetablesCatalogImpl.java b/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/VegetablesCatalogImpl.java deleted file mode 100644 index 06d13b3804..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/main/java/services/sca/VegetablesCatalogImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 services.sca; - -import java.util.ArrayList; -import java.util.List; - -import org.oasisopen.sca.annotation.Init; - -import services.Catalog; -import services.Item; - -public class VegetablesCatalogImpl implements Catalog { - - private List catalog = new ArrayList(); - - @Init - public void init() { - catalog.add(new Item("Broccoli", 2.99)); - catalog.add(new Item("Asparagus", 3.55)); - catalog.add(new Item("Cauliflower", 1.55)); - } - - public Item[] get() { - Item[] catalogArray = new Item[catalog.size()]; - catalog.toArray(catalogArray); - return catalogArray; - } -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java b/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java deleted file mode 100644 index 9914995e04..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogLocalTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.performance; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Node; -import org.junit.Assert; -import org.junit.Test; - -import services.Catalog; - -/** - * @version $Rev$ $Date$ - */ -public class CatalogLocalTest extends TestCase { - public static String COMPOSITE = "catalog-local.composite"; - - private Node node; - - public CatalogLocalTest() { - super(); - } - - public CatalogLocalTest(String name, Node node) { - super(name); - this.node = node; - } - - @Test - public void testCatalog() throws Exception { - Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); - Assert.assertEquals(6, catalogService.get().length); - } -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java b/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java deleted file mode 100644 index cfebd1c52b..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteJsonRPCTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.performance; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Node; -import org.junit.Assert; -import org.junit.Test; - -import services.Catalog; - -/** - * @version $Rev$ $Date$ - */ -public class CatalogRemoteJsonRPCTest extends TestCase { - public static String COMPOSITE = "catalog-remote-jsonrpc.composite"; - - private Node node; - - public CatalogRemoteJsonRPCTest(String name, Node node) { - super(name); - this.node = node; - } - - @Test - public void testCatalog() throws Exception { - Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); - Assert.assertEquals(6, catalogService.get().length); - } -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java b/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java deleted file mode 100644 index 075789a327..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/CatalogRemoteWsTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.performance; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Node; -import org.junit.Assert; -import org.junit.Test; - -import services.Catalog; - -/** - * @version $Rev$ $Date$ - */ -public class CatalogRemoteWsTest extends TestCase { - public static String COMPOSITE = "catalog-remote-ws.composite"; - - private Node node; - - public CatalogRemoteWsTest(String name, Node node) { - super(name); - this.node = node; - } - - @Test - public void testCatalog() throws Exception { - Catalog catalogService = node.getService(Catalog.class, "CatalogAggregator"); - Assert.assertEquals(6, catalogService.get().length); - } -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java b/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java deleted file mode 100644 index 57648a7137..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/java/org/apache/tuscany/sca/performance/LoadTestCase.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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.performance; - -import java.text.NumberFormat; -import java.util.concurrent.TimeUnit; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Test; - -import com.clarkware.junitperf.ConstantTimer; -import com.clarkware.junitperf.LoadTest; -import com.clarkware.junitperf.Timer; - -public class LoadTestCase { - private static int USERS = 50; - private static int ITERATIONS = 10; - private static Timer TIMER = new ConstantTimer(10); - - protected static synchronized Node initializeTuscanyRuntime(String composite) { - System.out.println(">>> initializing Tuscany Runtime...."); - - /* - Node node = null; - - NodeFactory factory = NodeFactory.getInstance(); - - String location = ContributionLocationHelper.getContributionLocation(LoadTestCase.class); - - ContributionConfiguration contributionConfiguration = - factory.createContributionConfiguration() - .addDeploymentComposite(composite) - .setURI("c") - .setLocation(location); - - NodeConfiguration configuration = - factory.createNodeConfiguration() - //.setDomainURI("tuscany:performance") - .addContribution(contributionConfiguration); - - node = factory.createNode(configuration); - node.start(); - */ - - /**/ - long startTime = 0; - long endTime = 0; - long duration = 0; - - Node node = null; - - startTime = System.nanoTime(); - - String location = ContributionLocationHelper.getContributionLocation(LoadTestCase.class); - node = NodeFactory.newInstance().createNode(composite, new Contribution("c", location)); - node.start(); - - endTime = System.nanoTime(); - duration = TimeUnit.MILLISECONDS.convert(endTime - startTime, TimeUnit.NANOSECONDS); - - System.out.println(">>> >>> Runtime initialization: " + - NumberFormat.getInstance().format(duration) + " ms"); - - /**/ - - return node; - } - - public static junit.framework.Test localTests() { - System.out.println("#### Local Tests"); - Node node = initializeTuscanyRuntime(CatalogLocalTest.COMPOSITE); - junit.framework.Test testCase = new CatalogLocalTest("testCatalog", node); - junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); - //node.stop(); - return loadTest; - } - - public static junit.framework.Test jsonTests() { - System.out.println("#### JSON-RPC Remote Tests"); - Node node = initializeTuscanyRuntime(CatalogRemoteJsonRPCTest.COMPOSITE); - junit.framework.Test testCase = new CatalogRemoteJsonRPCTest("testCatalog", node); - junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); - //node.stop(); - return loadTest; - } - - public static junit.framework.Test wsTests() { - System.out.println("#### WS Remote Tests"); - Node node = initializeTuscanyRuntime(CatalogRemoteWsTest.COMPOSITE); - junit.framework.Test testCase = new CatalogRemoteJsonRPCTest("testCatalog", node ); - junit.framework.Test loadTest = new LoadTest(testCase, USERS, ITERATIONS, TIMER); - //node.stop(); - return loadTest; - } - - @Test - public void run() throws Exception { - junit.textui.TestRunner.run(localTests()); - junit.textui.TestRunner.run(jsonTests()); - junit.textui.TestRunner.run(wsTests()); - } - - - public static void main(String[] args) throws Exception { - LoadTestCase loadTest = new LoadTestCase(); - loadTest.run(); - } - -} diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-local.composite b/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-local.composite deleted file mode 100644 index 707bc5ae32..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-local.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-jsonrpc.composite b/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-jsonrpc.composite deleted file mode 100644 index 545b9d7b10..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-jsonrpc.composite +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-ws.composite b/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-ws.composite deleted file mode 100644 index 5ad7789e84..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/catalog-remote-ws.composite +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/log4j.properties b/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/log4j.properties deleted file mode 100644 index 05e7450068..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/log4j.properties +++ /dev/null @@ -1,28 +0,0 @@ -# -# -# 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. -# -# - -# Configure the console as our one appender -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n - -#tuscany debug messages -log4j.category.org.apache.tuscany=DEBUG,A1 diff --git a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/logging.properties b/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/logging.properties deleted file mode 100644 index d7f03147b2..0000000000 --- a/sandbox/lresende/sca-2.x/itest/performance/src/test/resources/logging.properties +++ /dev/null @@ -1,37 +0,0 @@ -# -# -# 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. -# -# -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# - -# Set the default logging level for all loggers to WARNING -.level = DEBUG - -#tuscany debug messages -org.apache.tuscany.level = DEBUG - -- cgit v1.2.3