jakarta-bsf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r589073 - in /jakarta/bsf/branches/bsf-3.0-beta2: bsf-engines/ distribution/ testing/ testing/jython-2.2/ testing/jython-2.2/src/ testing/jython-2.2/src/main/ testing/jython-2.2/src/test/ testing/jython-2.2/src/test/java/ testing/jython-2.2...
Date Sat, 27 Oct 2007 11:05:01 GMT
Author: antelder
Date: Sat Oct 27 04:05:00 2007
New Revision: 589073

URL: http://svn.apache.org/viewvc?rev=589073&view=rev
Log:
Merge trunk changes for jython 2.2 and Ant build scripts into beta2 branch

Added:
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/pom.xml
      - copied unchanged from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/pom.xml
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/main/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/main/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/apache/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/apache/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/apache/bsf/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/apache/bsf/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/apache/bsf/testing/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/apache/bsf/testing/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/apache/bsf/testing/python/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/apache/bsf/testing/python/
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/java/org/apache/bsf/testing/python/HelloTestCase.java
      - copied unchanged from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/java/org/apache/bsf/testing/python/HelloTestCase.java
    jakarta/bsf/branches/bsf-3.0-beta2/testing/jython-2.2/src/test/resources/
      - copied from r589070, jakarta/bsf/trunk/bsf3/testing/jython-2.2/src/test/resources/
Modified:
    jakarta/bsf/branches/bsf-3.0-beta2/bsf-engines/build.xml
    jakarta/bsf/branches/bsf-3.0-beta2/distribution/build.xml
    jakarta/bsf/branches/bsf-3.0-beta2/testing/pom.xml

Modified: jakarta/bsf/branches/bsf-3.0-beta2/bsf-engines/build.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf-3.0-beta2/bsf-engines/build.xml?rev=589073&r1=589072&r2=589073&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf-3.0-beta2/bsf-engines/build.xml (original)
+++ jakarta/bsf/branches/bsf-3.0-beta2/bsf-engines/build.xml Sat Oct 27 04:05:00 2007
@@ -37,7 +37,7 @@
     <target name="install-engines" depends="merge-engines">
 
         <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="true">
-            <arg line="install:install-file -DgroupId=org.apache.bsf -DartifactId=bsf-engines
-Dversion=${bsf.version} -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}\target\bsf-engines-${bsf.version}.jar"/>
+            <arg line="install:install-file -DgroupId=org.apache.bsf -DartifactId=bsf-engines
-Dversion=${bsf.version} -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/bsf-engines-${bsf.version}.jar"/>
         </exec>
 
     </target>

Modified: jakarta/bsf/branches/bsf-3.0-beta2/distribution/build.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf-3.0-beta2/distribution/build.xml?rev=589073&r1=589072&r2=589073&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf-3.0-beta2/distribution/build.xml (original)
+++ jakarta/bsf/branches/bsf-3.0-beta2/distribution/build.xml Sat Oct 27 04:05:00 2007
@@ -26,15 +26,15 @@
 
     <target name="create-bsf-all">
 
-        <mkdir dir="${basedir}\target\bsf-all"/>
-        <unzip src="${localRepository}/org/apache/bsf/bsf-api/${bsf.version}/bsf-api-${bsf.version}.jar"
dest="${basedir}\target\bsf-all" overwrite="false"/>
-        <unzip src="${localRepository}/org/apache/bsf/bsf-engines/${bsf.version}/bsf-engines-${bsf.version}.jar"
dest="${basedir}\target\bsf-all" overwrite="false"/>
-        <unzip src="${localRepository}/org/apache/bsf/bsf-utils/${bsf.version}/bsf-utils-${bsf.version}.jar"
dest="${basedir}\target\bsf-all" overwrite="false"/>
+        <mkdir dir="${basedir}/target/bsf-all"/>
+        <unzip src="${localRepository}/org/apache/bsf/bsf-api/${bsf.version}/bsf-api-${bsf.version}.jar"
dest="${basedir}/target/bsf-all" overwrite="false"/>
+        <unzip src="${localRepository}/org/apache/bsf/bsf-engines/${bsf.version}/bsf-engines-${bsf.version}.jar"
dest="${basedir}/target/bsf-all" overwrite="false"/>
+        <unzip src="${localRepository}/org/apache/bsf/bsf-utils/${bsf.version}/bsf-utils-${bsf.version}.jar"
dest="${basedir}/target/bsf-all" overwrite="false"/>
 
-        <copy file="${basedir}/src/bin/LICENSE" tofile="${basedir}\target\bsf-all\LICENSE"
overwrite="true" />
-        <copy file="${basedir}/src/bin/NOTICE" tofile="${basedir}\target\bsf-all\NOTICE"
overwrite="true" />
+        <copy file="${basedir}/src/bin/LICENSE" tofile="${basedir}/target/bsf-all/LICENSE"
overwrite="true" />
+        <copy file="${basedir}/src/bin/NOTICE" tofile="${basedir}/target/bsf-all/NOTICE"
overwrite="true" />
 
-        <zip destfile="${basedir}/target/bsf-all-${bsf.version}.jar" basedir="${basedir}\target\bsf-all"
/>
+        <zip destfile="${basedir}/target/bsf-all-${bsf.version}.jar" basedir="${basedir}/target/bsf-all"
/>
 
         <!-- these are required for the mvn install command to work correctly -->
         <condition property="maven.suffix" value="">
@@ -45,7 +45,7 @@
         </condition>
 
         <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="true">
-            <arg line="install:install-file -DgroupId=org.apache.bsf -DartifactId=bsf-all
-Dversion=${bsf.version} -Dpackaging=jar -DgeneratePom=false -Dfile=${basedir}\target\bsf-all-${bsf.version}.jar"/>
+            <arg line="install:install-file -DgroupId=org.apache.bsf -DartifactId=bsf-all
-Dversion=${bsf.version} -Dpackaging=jar -DgeneratePom=false -Dfile=${basedir}/target/bsf-all-${bsf.version}.jar"/>
         </exec>
 
     </target>

Modified: jakarta/bsf/branches/bsf-3.0-beta2/testing/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf-3.0-beta2/testing/pom.xml?rev=589073&r1=589072&r2=589073&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf-3.0-beta2/testing/pom.xml (original)
+++ jakarta/bsf/branches/bsf-3.0-beta2/testing/pom.xml Sat Oct 27 04:05:00 2007
@@ -42,6 +42,7 @@
                 <module>groovy-1.1</module>
                 <module>javascript</module>
                 <module>python</module>
+                <module>jython-2.2</module>
                 <module>ruby</module>
             </modules>
         </profile>



---------------------------------------------------------------------
To unsubscribe, e-mail: bsf-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: bsf-dev-help@jakarta.apache.org


Mime
View raw message