From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:26:33 +0000 Subject: Moving 1.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68 --- tags/java/sca/1.5.1-RC1/itest/scopes/pom.xml | 47 ----------- .../scopes/CompositeScopeStateVerifierImpl.java | 46 ----------- .../scopes/RequestScopeStateVerifierImpl.java | 50 ------------ .../tuscany/sca/itest/scopes/StateVerifier.java | 25 ------ .../scopes/src/main/resources/scopes.composite | 33 -------- .../org/apache/tuscany/sca/test/ScopeTestCase.java | 93 ---------------------- 6 files changed, 294 deletions(-) delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/pom.xml delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/src/main/resources/scopes.composite delete mode 100644 tags/java/sca/1.5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java (limited to 'tags/java/sca/1.5.1-RC1/itest/scopes') diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/pom.xml b/tags/java/sca/1.5.1-RC1/itest/scopes/pom.xml deleted file mode 100644 index 12b2da72fa..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-scopes - Apache Tuscany SCA iTest Scopes - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java deleted file mode 100644 index 4aa414be8e..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.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 org.apache.tuscany.sca.itest.scopes; - -import org.osoa.sca.annotations.Scope; - -/** - * Test Composite scope - */ -@Scope("COMPOSITE") -public class CompositeScopeStateVerifierImpl implements StateVerifier { - - // State data for this module (composite). - // In order to support thread-based state verification, - // the module state needs to be a ThreadLocal. - ThreadLocal moduleState; - - public CompositeScopeStateVerifierImpl() { - moduleState = new ThreadLocal(); - } - - public void setState(int i) { - moduleState.set(i); - } - - public boolean checkState(int i) { - return (moduleState.get() == i); - } - -} diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java deleted file mode 100644 index fae4dcd586..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.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 org.apache.tuscany.sca.itest.scopes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; - -/** - * Test request scope - */ -@Scope("REQUEST") -public class RequestScopeStateVerifierImpl implements StateVerifier { - // State data for this request thread. - int requestState; - - public void setState(int i) { - requestState = i; - } - - public boolean checkState(int i) { - return (requestState == i); - } - - @Init - public void init() { - requestState = 0; - } - - @Destroy - public void destroy() { - requestState = -1; - } - -} \ No newline at end of file diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java deleted file mode 100644 index 878f7e4cc6..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java +++ /dev/null @@ -1,25 +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.itest.scopes; - -public interface StateVerifier { - void setState(int i); - boolean checkState(int i); -} - diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/resources/scopes.composite b/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/resources/scopes.composite deleted file mode 100644 index 54a1b66830..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/src/main/resources/scopes.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/tags/java/sca/1.5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java deleted file mode 100644 index ce2519cbc0..0000000000 --- a/tags/java/sca/1.5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java +++ /dev/null @@ -1,93 +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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.scopes.StateVerifier; - -public class ScopeTestCase extends TestCase { - - final static int numThreads = 4; // number of threads to drive each scope container - final static int iterations = 200; // number of iterations per thread - private SCADomain domain; - - // Test scope containers. - // The request scope container isn't hooked up for some reason so the code below - // that tests request scope is commented out. - // Code could be added to test session scope once it is supported in a standalone environment. - - public void testScopes() throws InterruptedException { - - Thread[] moduleScopeThreadTable = new Thread[numThreads]; - Thread[] requestScopeThreadTable = new Thread[numThreads]; - - for(int i=0; i