You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/06/03 03:14:10 UTC
svn commit: r950845 - in /jakarta/bsf/branches/bsf3.x: RELEASE_NOTES
distribution/bin.xml distribution/build.xml distribution/src.xml
testing/e4x-1.6R7-Axiom/pom.xml testing/e4x/pom.xml
testing/javascript/pom.xml testing/python/pom.xml
Author: sebb
Date: Thu Jun 3 01:14:09 2010
New Revision: 950845
URL: http://svn.apache.org/viewvc?rev=950845&view=rev
Log:
Remove bsf-engines from distribution
(still needed for some tests)
Modified:
jakarta/bsf/branches/bsf3.x/RELEASE_NOTES
jakarta/bsf/branches/bsf3.x/distribution/bin.xml
jakarta/bsf/branches/bsf3.x/distribution/build.xml
jakarta/bsf/branches/bsf3.x/distribution/src.xml
jakarta/bsf/branches/bsf3.x/testing/e4x-1.6R7-Axiom/pom.xml
jakarta/bsf/branches/bsf3.x/testing/e4x/pom.xml
jakarta/bsf/branches/bsf3.x/testing/javascript/pom.xml
jakarta/bsf/branches/bsf3.x/testing/python/pom.xml
Modified: jakarta/bsf/branches/bsf3.x/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/RELEASE_NOTES?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/RELEASE_NOTES (original)
+++ jakarta/bsf/branches/bsf3.x/RELEASE_NOTES Thu Jun 3 01:14:09 2010
@@ -19,8 +19,21 @@ What the jars contain
---------------------
bsf-api.jar - javax.script package which implements JSR-223 for Java 1.4+
bsf-utils.jar - additional utilities for use with all JSR-223 implementations.
-bsf-engines.jar - collection of 3rd party JSR-223 factory implementations
-bsf-all.jar - all the above
+bsf-all.jar - both the above
+
+IMPORTANT
+=========
+Note that BSF 3.1 does not contain bsf-engines.jar, which was a repackaging
+of the JSR-223 factories from https://scripting.dev.java.net/.
+
+This is because:
+- the jar contained all the engine factories as a single bundle. It was not
+ possible to select individual factories, and this could lead to clashes with
+ other factories on the classpath.
+- the jar did not contain any implementations, so it was still necessary to download
+ the engine.
+Many engines contain their own factories now; for those that don't the factory can
+still be downloaded from https://scripting.dev.java.net/.
Incomplete packages
-------------------
Modified: jakarta/bsf/branches/bsf3.x/distribution/bin.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/distribution/bin.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/distribution/bin.xml (original)
+++ jakarta/bsf/branches/bsf3.x/distribution/bin.xml Thu Jun 3 01:14:09 2010
@@ -37,7 +37,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>distribution/src/bin/</directory>
+ <directory>.</directory>
<outputDirectory>bsf-${bsf.version}</outputDirectory>
<includes>
<include>LICENSE</include>
@@ -53,13 +53,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>bsf-engines/target</directory>
- <outputDirectory>bsf-${bsf.version}/lib</outputDirectory>
- <includes>
- <include>bsf-engines-${bsf.version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>bsf-utils/target</directory>
<outputDirectory>bsf-${bsf.version}/lib</outputDirectory>
<includes>
@@ -74,19 +67,4 @@
</includes>
</fileSet>
</fileSets>
- <dependencySets>
- <!-- dependencySet>
- <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
- <includes>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
- </includes>
- <excludes>
- <exclude>org.apache.axis2:addressing:mar</exclude>
- <exclude>org.apache.rampart:rampart:mar</exclude>
- <exclude>org.apache.sandesha2:sandesha2:mar</exclude>
- </excludes>
- </dependencySet -->
- </dependencySets>
</assembly>
Modified: jakarta/bsf/branches/bsf3.x/distribution/build.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/distribution/build.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/distribution/build.xml (original)
+++ jakarta/bsf/branches/bsf3.x/distribution/build.xml Thu Jun 3 01:14:09 2010
@@ -26,15 +26,14 @@
<mkdir dir="${basedir}/target/bsf-all"/>
<unzip src="${basedir}/../bsf-api/target/bsf-api-${bsf.version}.jar" dest="${basedir}/target/bsf-all" overwrite="false"/>
- <unzip src="${basedir}/../bsf-engines/target/bsf-engines-${bsf.version}.jar" dest="${basedir}/target/bsf-all" overwrite="false"/>
<unzip src="${basedir}/../bsf-utils/target/bsf-utils-${bsf.version}.jar" dest="${basedir}/target/bsf-all" overwrite="false"/>
<!-- Proper versions will be created in the META-INF directory -->
<delete file="${basedir}/target/bsf-all/LICENSE"/>
<delete file="${basedir}/target/bsf-all/NOTICE"/>
- <copy file="${basedir}/src/bin/LICENSE" tofile="${basedir}/target/bsf-all/META-INF/LICENSE" overwrite="true" />
- <copy file="${basedir}/src/bin/NOTICE" tofile="${basedir}/target/bsf-all/META-INF/--NOTICE" overwrite="true" />
+ <copy file="${basedir}/../LICENSE" tofile="${basedir}/target/bsf-all/META-INF/LICENSE" overwrite="true" />
+ <copy file="${basedir}/../NOTICE" tofile="${basedir}/target/bsf-all/META-INF/NOTICE" overwrite="true" />
<!-- Now package all that up into a single jar -->
<jar destfile="${basedir}/target/bsf-all-${bsf.version}.jar" basedir="${basedir}/target/bsf-all">
Modified: jakarta/bsf/branches/bsf3.x/distribution/src.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/distribution/src.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/distribution/src.xml (original)
+++ jakarta/bsf/branches/bsf3.x/distribution/src.xml Thu Jun 3 01:14:09 2010
@@ -28,30 +28,21 @@
<fileSets>
<fileSet>
- <!-- directory>src/main/release</directory -->
- <outputDirectory>bsf-${bsf.version}-src</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>.</directory>
<outputDirectory>bsf-${bsf.version}-src</outputDirectory>
<includes>
<include>BUILDING</include>
<include>LICENSE</include>
<include>NOTICE</include>
+ <include>README</include>
<include>RELEASE_NOTES</include>
<include>pom.xml</include>
<include>bsf-api/**/*</include>
- <include>bsf-engines/**/*</include>
<include>bsf-utils/**/*</include>
<include>distribution/**/*</include>
<include>testing/**/*</include>
</includes>
<excludes>
- <exclude>bsf-engines/engines-download/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
<exclude>**/.settings/**</exclude>
Modified: jakarta/bsf/branches/bsf3.x/testing/e4x-1.6R7-Axiom/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/testing/e4x-1.6R7-Axiom/pom.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/testing/e4x-1.6R7-Axiom/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/testing/e4x-1.6R7-Axiom/pom.xml Thu Jun 3 01:14:09 2010
@@ -54,6 +54,12 @@
<artifactId>bsf-all</artifactId>
<version>${bsf.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-engines</artifactId>
+ <version>${bsf.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>rhino</groupId>
Modified: jakarta/bsf/branches/bsf3.x/testing/e4x/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/testing/e4x/pom.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/testing/e4x/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/testing/e4x/pom.xml Thu Jun 3 01:14:09 2010
@@ -45,6 +45,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-engines</artifactId>
+ <version>${bsf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>1.6R5</version>
Modified: jakarta/bsf/branches/bsf3.x/testing/javascript/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/testing/javascript/pom.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/testing/javascript/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/testing/javascript/pom.xml Thu Jun 3 01:14:09 2010
@@ -45,6 +45,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-engines</artifactId>
+ <version>${bsf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
<version>1.6R5</version>
Modified: jakarta/bsf/branches/bsf3.x/testing/python/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/testing/python/pom.xml?rev=950845&r1=950844&r2=950845&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/testing/python/pom.xml (original)
+++ jakarta/bsf/branches/bsf3.x/testing/python/pom.xml Thu Jun 3 01:14:09 2010
@@ -45,6 +45,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-engines</artifactId>
+ <version>${bsf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<!-- 2.5.0 is broken. Upgrade to 2.5.1 when that is published to Maven -->
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org