You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/09/07 14:27:56 UTC

svn commit: r812108 - in /tuscany/branches/sca-java-1.5.1/itest/distro-license-check: ./ pom.xml src/test/java/itest/LicenseTestCase.java

Author: antelder
Date: Mon Sep  7 12:27:56 2009
New Revision: 812108

URL: http://svn.apache.org/viewvc?rev=812108&view=rev
Log:
Copy the license checking itest from 1.x to 1.5.1 branch. It is passing ok but haven't added it to the build yet as its got hardcoded version in the java src which will break when the release tag is done. I'll look at fixing it so its not hardcoded

Added:
    tuscany/branches/sca-java-1.5.1/itest/distro-license-check/   (props changed)
      - copied from r812104, tuscany/branches/sca-java-1.x/itest/distro-license-check/
Modified:
    tuscany/branches/sca-java-1.5.1/itest/distro-license-check/pom.xml
    tuscany/branches/sca-java-1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java

Propchange: tuscany/branches/sca-java-1.5.1/itest/distro-license-check/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep  7 12:27:56 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders

Propchange: tuscany/branches/sca-java-1.5.1/itest/distro-license-check/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep  7 12:27:56 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/itest/distro-license-check:671193

Modified: tuscany/branches/sca-java-1.5.1/itest/distro-license-check/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/distro-license-check/pom.xml?rev=812108&r1=812104&r2=812108&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/distro-license-check/pom.xml (original)
+++ tuscany/branches/sca-java-1.5.1/itest/distro-license-check/pom.xml Mon Sep  7 12:27:56 2009
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>1.6-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distro-license-check</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.5.1-SNAPSHOT</version>
             <type>zip</type>
         </dependency>
 

Modified: tuscany/branches/sca-java-1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java?rev=812108&r1=812104&r2=812108&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java Mon Sep  7 12:27:56 2009
@@ -40,7 +40,7 @@
     
     public void testCreateComponent() throws ZipException, IOException {
 
-        File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.6-SNAPSHOT.zip");
+        File archive = new File("..\\..\\distribution\\target\\apache-tuscany-sca-1.5.1-SNAPSHOT.zip");
         ZipFile zf = new ZipFile(archive);
         try {
 
@@ -121,7 +121,7 @@
     }
 
     private String getLicenseText(ZipFile zf) throws IOException {
-        ZipEntry ze = zf.getEntry("tuscany-sca-1.6-SNAPSHOT/LICENSE");
+        ZipEntry ze = zf.getEntry("tuscany-sca-1.5.1-SNAPSHOT/LICENSE");
         InputStream in = zf.getInputStream(ze);
         String l = readLICENSE(in);
         return l;