From 3d3b8834b93b98cc7d7534e693e937179067eb58 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 May 2009 08:44:44 +0000
Subject: Delete previous 1.5 branch thats now old and unused and will be
 replaced with the current 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.5/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 branches/sca-java-1.5/itest/scopes/pom.xml
 delete mode 100644 branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
 delete mode 100644 branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
 delete mode 100644 branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
 delete mode 100644 branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
 delete mode 100644 branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java

(limited to 'branches/sca-java-1.5/itest/scopes')

diff --git a/branches/sca-java-1.5/itest/scopes/pom.xml b/branches/sca-java-1.5/itest/scopes/pom.xml
deleted file mode 100644
index 1949a0ac41..0000000000
--- a/branches/sca-java-1.5/itest/scopes/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-scopes</artifactId>    
-    <name>Apache Tuscany SCA iTest Scopes</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
deleted file mode 100644
index 4aa414be8e..0000000000
--- a/branches/sca-java-1.5/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<Integer> moduleState;
-
-    public CompositeScopeStateVerifierImpl() {
-      moduleState = new ThreadLocal<Integer>();
-    }
-
-    public void setState(int i) {
-      moduleState.set(i);
-    }
-
-    public boolean checkState(int i) {
-      return (moduleState.get() == i);
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
deleted file mode 100644
index fae4dcd586..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
deleted file mode 100644
index 878f7e4cc6..0000000000
--- a/branches/sca-java-1.5/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/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite b/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
deleted file mode 100644
index 54a1b66830..0000000000
--- a/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-       name="Scopes">
-
-    <!-- Components used to test scopes. -->
-
- 	<component name="RequestScopeComponent">
-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.RequestScopeStateVerifierImpl"/>
-    </component>
-
- 	<component name="ModuleScopeComponent">
-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.CompositeScopeStateVerifierImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
deleted file mode 100644
index ce2519cbc0..0000000000
--- a/branches/sca-java-1.5/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<numThreads; i++)
-      {
-        moduleScopeThreadTable[i] = new ModuleScopeTestThread();
-        requestScopeThreadTable[i] = new RequestScopeTestThread();
-      }
-      for(int j=0; j<numThreads; j++)
-      {
-        moduleScopeThreadTable[j].start();
-        requestScopeThreadTable[j].start();
-      }
-      for(int k=0; k<numThreads; k++)
-      {
-        moduleScopeThreadTable[k].join();
-        requestScopeThreadTable[k].join();
-      }
-    }
-
-    private  class ModuleScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier moduleScopeService = domain.getService(StateVerifier.class, "ModuleScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          moduleScopeService.setState(i);
-          if (!moduleScopeService.checkState(i))
-            fail("The module scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    private class RequestScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier requestScopeService = domain.getService(StateVerifier.class, "RequestScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          requestScopeService.setState(i);
-          if (!requestScopeService.checkState(i))
-            fail("The request scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("scopes.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-    
-}
-- 
cgit v1.2.3