From 05cb79859c35a801922b5eb86f336ab5e1e13d53 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 18 Oct 2010 02:28:46 +0000 Subject: Deleting 2.0-M5-RC2 release candidate tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1023632 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/distribution/bin-distro-unzip/build.xml | 27 ---- .../itest/distribution/bin-distro-unzip/pom.xml | 128 ---------------- .../contribution-binding-rmi-calculator/build.xml | 39 ----- .../contribution-binding-rmi-calculator/pom.xml | 68 --------- .../contribution-binding-sca-calculator/build.xml | 40 ----- .../contribution-binding-sca-calculator/pom.xml | 87 ----------- .../contribution-binding-ws-calculator/build.xml | 40 ----- .../contribution-binding-ws-calculator/pom.xml | 69 --------- .../build.xml | 40 ----- .../pom.xml | 87 ----------- .../distribution/launcher-embedded-jse/build.xml | 41 ------ .../distribution/launcher-embedded-jse/pom.xml | 69 --------- .../distribution/launcher-embedded-osgi/build.xml | 45 ------ .../distribution/launcher-embedded-osgi/pom.xml | 69 --------- .../itest/distribution/legal-checks/pom.xml | 47 ------ .../src/test/java/itest/JarsInLICENSETestCase.java | 162 --------------------- .../tags/2.0-M5-RC2/itest/distribution/pom.xml | 71 --------- 17 files changed, 1129 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/build.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java delete mode 100644 sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/pom.xml (limited to 'sca-java-2.x/tags/2.0-M5-RC2/itest/distribution') diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/build.xml deleted file mode 100644 index 6c4b1fdf3f..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/build.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/pom.xml deleted file mode 100644 index 0b58290ea0..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/bin-distro-unzip/pom.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-bin-distro-unzip - Apache Tuscany SCA iTest Distribution Bin Distro Unzip - - - - org.apache.tuscany.sca - tuscany-distribution-all - pom - 2.0 - - - - - - - - not-sun-jdk - - - ${java.home}/../lib/tools.jar - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - run-samples - verify - - run - - - - - - - - - - - - - - - - - sun-jdk - - - ${java.home}/../lib/tools.jar - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - sun.jdk - tools - 1.6 - system - ${java.home}/../lib/tools.jar - - - - - - run-samples - verify - - run - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/build.xml deleted file mode 100644 index 86afb7a952..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/build.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/pom.xml deleted file mode 100644 index ef87ceacb0..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-rmi-calculator/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-contribution-binding-rmi-calculator - Apache Tuscany SCA iTest Distribution Contribution binding-rmi Calculator - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - run-samples - verify - - run - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/build.xml deleted file mode 100644 index bd5f247a19..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - ${java.home} - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/pom.xml deleted file mode 100644 index ceb8cc94fb..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-sca-calculator/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-contribution-binding-sca-calculator - Apache Tuscany SCA iTest Distribution Contribution binding-sca Calculator - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - sun.jdk - tools - 1.6 - system - ${java.home}/../lib/tools.jar - - - - - - run-samples - verify - - run - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/build.xml deleted file mode 100644 index de8ea977a9..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - ${java.home} - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/pom.xml deleted file mode 100644 index 359bad4233..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-binding-ws-calculator/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-contribution-binding-ws-calculator - Apache Tuscany SCA iTest Distribution Contribution binding-ws Calculator - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - run-samples - verify - - run - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/build.xml deleted file mode 100644 index 52704f49f1..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - ${java.home} - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/pom.xml deleted file mode 100644 index 9255c147bf..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/contribution-implementation-java-calculator/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-contribution-implementation-java-calculator - Apache Tuscany SCA iTest Distribution contribution implementation-java Calculator - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - sun.jdk - tools - 1.6 - system - ${java.home}/../lib/tools.jar - - - - - - run-samples - verify - - run - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/build.xml deleted file mode 100644 index cd569b380a..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/build.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - ${java.home} - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/pom.xml deleted file mode 100644 index 64015a7403..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-jse/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-launcher-embedded-jse - Apache Tuscany SCA iTest Distribution Launcher Embedded JSE - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - run-samples - verify - - run - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/build.xml deleted file mode 100644 index c6874ed86e..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/build.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - ${java.home} - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/pom.xml deleted file mode 100644 index 6b55fa44fa..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/launcher-embedded-osgi/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-launcher-embedded-osgi - Apache Tuscany SCA iTest Distribution Launcher Embedded OSGi - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - run-samples - verify - - run - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/pom.xml deleted file mode 100644 index 15bb05736b..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-distribution - 2.0 - ../pom.xml - - itest-distribution-legal-checks - Apache Tuscany SCA iTest Distribution Legal Checks - - - - distribution - - - org.apache.tuscany.sca - itest-bin-distro-unzip - pom - 2.0 - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java deleted file mode 100644 index 3564128c8d..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java +++ /dev/null @@ -1,162 +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 itest; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.junit.Test; - -/** - * Checks that all jar files included in the distribution are mentioned in the LICENSE file - * and that all jars mentioned in the LICENSE are in the distribution. - */ -public class JarsInLICENSETestCase { - - @Test - public void testJars() throws Exception { - File distroRoot = getUnzipedDistroRoot(); - - File licenseFile = new File(distroRoot, "LICENSE"); - if (!licenseFile.exists()) { - throw new IllegalStateException("can't find LICENSE file at: " + licenseFile.getAbsoluteFile().toString()); - } - - File libDirectory = new File(distroRoot, "modules"); - if (!libDirectory.exists()) { - throw new IllegalStateException("can't find modules folder at: " + libDirectory.getAbsoluteFile().toString()); - } - - List jars = getJarsInDistro(libDirectory); - - List bad2 = getLICENSEJarsNotInDistro(licenseFile, jars); - if (bad2.size() > 0) { - System.err.println("Jars in LICENSE but not in Distribution: " + bad2); - } - - List bad1 = getJarsNotInLICENSE(jars, licenseFile); - if (bad1.size() > 0) { - System.err.println("Jars in distribution but not in LICENSE: " + bad1); - } - - if (bad1.size() > 0 || bad2.size() > 0) { - throw new IllegalStateException("LICENSE problems, check log"); - } - } - - private List getLICENSEJarsNotInDistro(File licenseFile, List jars) throws IOException { - List badJars = new ArrayList(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - String line = null; - while ((line = reader.readLine()) != null) { - line = line.trim(); - if (line.contains(".jar")) { - StringTokenizer st = new StringTokenizer(line); - while (st.hasMoreTokens()) { - String s = st.nextToken(); - if (s.contains(".jar")) { - if (s.startsWith("(")) { - s = s.substring(1); - } - if (s.endsWith(",") || s.endsWith(":")) { - s = s.substring(0, s.length()-1); - } - if (s.endsWith(")")) { - s = s.substring(0, s.length()-1); - } - if (!jars.contains(s) && !s.startsWith("tuscany-")) { - badJars.add(s); - } - } - } - } - } - return badJars; - } - - private List getJarsNotInLICENSE(List jars, File licenseFile) throws IOException { - List badJars = new ArrayList(); - String licenseText = readLICENSE(licenseFile); - for (String jar : jars) { - if (!licenseText.contains(jar)) { - if (jar.startsWith("tuscany-")) { - // ignore tuscany jars as they're not mentioned in the LICENSE file - } else { - badJars.add(jar); - } - } - } - return badJars; - } - - private List getJarsInDistro(File directory) { - List jars = new ArrayList(); - for (String fn : directory.list()){ - if (fn.endsWith(".jar")) { - jars.add(fn); - } else { - File f = new File(directory, fn); - if (f.isDirectory()) { - jars.addAll(getJarsInDistro(f)); - } - } - } - return jars; - } - - private File getUnzipedDistroRoot() { - File distroTarget = new File("../../../distribution/all/target"); - File root = null; - for (String f : distroTarget.list()) { - if (f.endsWith(".dir")) { - root = new File(distroTarget, f); - break; - } - } - if (root == null) { - throw new IllegalStateException("can't find distro root"); - } - if (root.list().length != 1) { - throw new IllegalStateException("expecting one directory in distro root"); - } - root = new File(root, root.list()[0]); - return root; - } - - private static String readLICENSE(File licenseFile) throws java.io.IOException { - StringBuffer fileData = new StringBuffer(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - char[] buf = new char[1024]; - int numRead = 0; - while ((numRead = reader.read(buf)) != -1) { - String readData = String.valueOf(buf, 0, numRead); - fileData.append(readData); - buf = new char[1024]; - } - reader.close(); - return fileData.toString(); - } - -} diff --git a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/pom.xml b/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/pom.xml deleted file mode 100644 index 4cc4ec8654..0000000000 --- a/sca-java-2.x/tags/2.0-M5-RC2/itest/distribution/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0 - ../pom.xml - - pom - itest-distribution - Apache Tuscany SCA iTest Distribution - - - - org.apache.tuscany.sca - tuscany-distribution-all - pom - 2.0 - - - - - - default - - true - - - - - distribution - - bin-distro-unzip - - - - - - legal-checks - contribution-binding-sca-calculator - contribution-binding-ws-calculator - contribution-binding-rmi-calculator - contribution-implementation-java-calculator - launcher-embedded-jse - launcher-embedded-osgi - - - - install - - - -- cgit v1.2.3