From 4b3149233be777a531417eb0ca6bafff0483fa1c Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Thu, 27 May 2010 12:19:53 +0000 Subject: Branch for 2.0 Milestone M5 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@948800 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 | 83 +++++++++++ .../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 +++++++++++++++++++++ .../sca-java-2.0-M5/itest/distribution/pom.xml | 71 +++++++++ 17 files changed, 1144 insertions(+) create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/build.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java create mode 100644 sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml (limited to 'sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution') diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/build.xml new file mode 100644 index 0000000000..6c4b1fdf3f --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/build.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml new file mode 100644 index 0000000000..d9793d810d --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/bin-distro-unzip/pom.xml @@ -0,0 +1,128 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../pom.xml + + itest-bin-distro-unzip + Apache Tuscany SCA iTest Distribution Bin Distro Unzip + + + + org.apache.tuscany.sca + tuscany-distribution-all + pom + 2.0-SNAPSHOT + + + + + + + + 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/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/build.xml new file mode 100644 index 0000000000..86afb7a952 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/build.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml new file mode 100644 index 0000000000..2f3f04c1f5 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-rmi-calculator/pom.xml @@ -0,0 +1,83 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + run-samples + verify + + run + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + + **/*TestCase.java + + brief + false + once + -ea -Xmx256m + off + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/build.xml new file mode 100644 index 0000000000..bd5f247a19 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/build.xml @@ -0,0 +1,40 @@ + + + + ${java.home} + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml new file mode 100644 index 0000000000..5ea30a20f7 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-sca-calculator/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + 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/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/build.xml new file mode 100644 index 0000000000..de8ea977a9 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/build.xml @@ -0,0 +1,40 @@ + + + + ${java.home} + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml new file mode 100644 index 0000000000..c598f122e0 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-binding-ws-calculator/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + run-samples + verify + + run + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/build.xml new file mode 100644 index 0000000000..52704f49f1 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/build.xml @@ -0,0 +1,40 @@ + + + + ${java.home} + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml new file mode 100644 index 0000000000..a0a1790c00 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/contribution-implementation-java-calculator/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + 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/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/build.xml new file mode 100644 index 0000000000..cd569b380a --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/build.xml @@ -0,0 +1,41 @@ + + + + ${java.home} + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml new file mode 100644 index 0000000000..93bd2e3327 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-jse/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + run-samples + verify + + run + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/build.xml new file mode 100644 index 0000000000..c6874ed86e --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/build.xml @@ -0,0 +1,45 @@ + + + + ${java.home} + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml new file mode 100644 index 0000000000..0e4a97a07f --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/launcher-embedded-osgi/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + run-samples + verify + + run + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml new file mode 100644 index 0000000000..3be416937e --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-distribution + 2.0-SNAPSHOT + ../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-SNAPSHOT + + + + + + + + diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java new file mode 100644 index 0000000000..3564128c8d --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java @@ -0,0 +1,162 @@ +/* + * 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/branches/sca-java-2.0-M5/itest/distribution/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml new file mode 100644 index 0000000000..fedd34c7a5 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M5/itest/distribution/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + ../pom.xml + + pom + itest-distribution + Apache Tuscany SCA iTest Distribution + + + + org.apache.tuscany.sca + tuscany-distribution-all + pom + 2.0-SNAPSHOT + + + + + + 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