jakarta-bsf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r522145 - in /jakarta/bsf/trunk/bsf3: ./ bsf-api/src/main/resources/META-INF/ bsf-engines/ bsf-engines/src/main/resources/META-INF/ bsf-utils/src/main/resources/ distribution/ distribution/src/ distribution/src/bin/
Date Sun, 25 Mar 2007 02:13:42 GMT
Author: antelder
Date: Sat Mar 24 19:13:41 2007
New Revision: 522145

URL: http://svn.apache.org/viewvc?view=rev&rev=522145
Log:
Updates to get the release distribution working. Now works with 'mvn assembly:assembly -Drelease'

Added:
    jakarta/bsf/trunk/bsf3/LICENSE   (with props)
    jakarta/bsf/trunk/bsf3/NOTICE   (with props)
    jakarta/bsf/trunk/bsf3/distribution/bin.xml   (with props)
    jakarta/bsf/trunk/bsf3/distribution/src/
    jakarta/bsf/trunk/bsf3/distribution/src.xml   (with props)
    jakarta/bsf/trunk/bsf3/distribution/src/bin/
    jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE   (with props)
    jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE   (with props)
    jakarta/bsf/trunk/bsf3/distribution/src/bin/README   (with props)
Removed:
    jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/DISCLAIMER
    jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/DISCLAIMER
Modified:
    jakarta/bsf/trunk/bsf3/BUILDING
    jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/NOTICE
    jakarta/bsf/trunk/bsf3/bsf-engines/build.xml
    jakarta/bsf/trunk/bsf3/bsf-engines/src/main/resources/META-INF/LICENSE
    jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/NOTICE
    jakarta/bsf/trunk/bsf3/distribution/build.xml
    jakarta/bsf/trunk/bsf3/pom.xml

Modified: jakarta/bsf/trunk/bsf3/BUILDING
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/BUILDING?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/BUILDING (original)
+++ jakarta/bsf/trunk/bsf3/BUILDING Sat Mar 24 19:13:41 2007
@@ -4,21 +4,34 @@
 BSF 3 is built with Apache Maven. Download and install Apache Maven 
 (version 2.0.4 or newer) from: http://maven.apache.org/download.html.
 
-To build BSF 3, from the top-level BSF 3 directory use the command 'mvn'.
+To build BSF 3, in the top-level BSF 3 directory use the command 'mvn'.
 
 This will automatically download any dependency jars from remote Maven 
 repositories. Remote repositories may sometimes be unreliable, if you 
 get intermitent repository errors just try running 'mvn' again.
 
-Once dependency jars have been downloaded you can use '-o' to run 
-Maven in offline mode, eg 'mvn -o'. 
-
 Other useful Maven commands are:
-'mvn clean install' to remove old artifacts and rebuild from scratch
-'mvn eclipse:eclipse' to setup Eclipse projects for the BSF modules
+
+'mvn clean install'
+  - to remove old artifacts and rebuild from scratch
+
+'mvn assembly:assembly -Drelease'
+  - to build the src and bin distros
+
+'mvn eclipse:eclipse'
+ - to setup Eclipse projects for the BSF modules
 
 Note, currently there is a bug in the BSF 3 projects setup which causes
 the Eclipse projects to be created badly for the test projects when
 running 'mvn eclipse:eclipse' in the BSF top-level directory. A temporary
 work around is to also run 'mvn eclipse:eclipse' within each test project
 directory, eg, testing\javascript or testing\ruby.
+
+Once dependency jars have been downloaded you can use '-o' to run 
+Maven in offline mode which is faster, eg 'mvn -o'. 
+
+Between BSF releases the BSF build may have dependencies based
+on a SNAPSHOT release. If this is the case the -U parameter 
+may sometimes be required to update to the latest SNAPSHOT 
+build of that dependency, eg. 'mvn -U'   
+

Added: jakarta/bsf/trunk/bsf3/LICENSE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/LICENSE?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/LICENSE (added)
+++ jakarta/bsf/trunk/bsf3/LICENSE Sat Mar 24 19:13:41 2007
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: jakarta/bsf/trunk/bsf3/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jakarta/bsf/trunk/bsf3/NOTICE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/NOTICE?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/NOTICE (added)
+++ jakarta/bsf/trunk/bsf3/NOTICE Sat Mar 24 19:13:41 2007
@@ -0,0 +1,16 @@
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+*----------------------------------------------------------------------*
+* BSF3 was developed according to the JSR-223 specs, but has not yet   *
+* been tested via the JSR-223 TCK. BSF can therefore not be considered *
+* a compatible implementation of JSR-223.                              *
+*----------------------------------------------------------------------*
+
+
+
+
+
+

Propchange: jakarta/bsf/trunk/bsf3/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/NOTICE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/NOTICE?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/NOTICE (original)
+++ jakarta/bsf/trunk/bsf3/bsf-api/src/main/resources/META-INF/NOTICE Sat Mar 24 19:13:41 2007
@@ -3,7 +3,11 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-See the DISCLAIMER file for compatability information.
+*----------------------------------------------------------------------*
+* BSF3 was developed according to the JSR-223 specs, but has not yet   *
+* been tested via the JSR-223 TCK. BSF can therefore not be considered *
+* a compatible implementation of JSR-223.                              *
+*----------------------------------------------------------------------*
 
 
 

Modified: jakarta/bsf/trunk/bsf3/bsf-engines/build.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/bsf-engines/build.xml?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/bsf-engines/build.xml (original)
+++ jakarta/bsf/trunk/bsf3/bsf-engines/build.xml Sat Mar 24 19:13:41 2007
@@ -19,7 +19,7 @@
 -->
 <project name="Engine-Installer">
 
-    <property name="engines.version" value="3.0-beta1-SNAPSHOT"/>
+    <property name="bsf.version" value="3.0-beta1-SNAPSHOT"/>
     <property name="download.dir" value="/target/engines-download/"/>
     <property name="download.file" value="${basedir}${download.dir}engines.zip"/>
     <property name="merged.engines.dir" value="${basedir}/target/merged-engines"/>
@@ -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=${engines.version} -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}\target\bsf-engines.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>
@@ -88,7 +88,7 @@
 
         <!-- Use Retroweaver to convert all the classes to JDK 1.4 -->
 
-        <retroweaver inputjar="${basedir}/target/bsf-engines.tmp.jar" outputjar="${basedir}/target/bsf-engines.jar"/>
+        <retroweaver inputjar="${basedir}/target/bsf-engines.tmp.jar" outputjar="${basedir}/target/bsf-engines-${bsf.version}.jar"/>
 
     </target>
 

Modified: jakarta/bsf/trunk/bsf3/bsf-engines/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/bsf-engines/src/main/resources/META-INF/LICENSE?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/bsf-engines/src/main/resources/META-INF/LICENSE (original)
+++ jakarta/bsf/trunk/bsf3/bsf-engines/src/main/resources/META-INF/LICENSE Sat Mar 24 19:13:41 2007
@@ -212,7 +212,7 @@
 the following BSD license:
 
  ============================================================================
-                    The scripts engine BSD License
+                    The script engines BSD License
  ============================================================================
 
 Copyright (c) 2006, Sun Microsystems, Inc.

Modified: jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/NOTICE?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/NOTICE (original)
+++ jakarta/bsf/trunk/bsf3/bsf-utils/src/main/resources/NOTICE Sat Mar 24 19:13:41 2007
@@ -3,7 +3,11 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-See the DISCLAIMER file for compatability information.
+*----------------------------------------------------------------------*
+* BSF3 was developed according to the JSR-223 specs, but has not yet   *
+* been tested via the JSR-223 TCK. BSF can therefore not be considered *
+* a compatible implementation of JSR-223.                              *
+*----------------------------------------------------------------------*
 
 
 

Added: jakarta/bsf/trunk/bsf3/distribution/bin.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/bin.xml?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/bin.xml (added)
+++ jakarta/bsf/trunk/bsf3/distribution/bin.xml Sat Mar 24 19:13:41 2007
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  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.
+  -->
+<assembly>
+
+    <id>bin</id>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>distribution/src/bin/</directory>
+            <outputDirectory>bsf-${bsf.version}</outputDirectory>
+            <includes>
+                <include>LICENSE</include>
+                <include>NOTICE</include>
+                <include>README</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>bsf-api/target</directory>
+            <outputDirectory>bsf-${bsf.version}/lib</outputDirectory>
+            <includes>
+                <include>bsf-api-${bsf.version}.jar</include>
+            </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>
+                <include>bsf-utils-${bsf.version}.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>distribution/target</directory>
+            <outputDirectory>bsf-${bsf.version}/lib</outputDirectory>
+            <includes>
+                <include>bsf-all-${bsf.version}.jar</include>
+            </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>

Propchange: jakarta/bsf/trunk/bsf3/distribution/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/distribution/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: jakarta/bsf/trunk/bsf3/distribution/bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: jakarta/bsf/trunk/bsf3/distribution/build.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/build.xml?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/build.xml (original)
+++ jakarta/bsf/trunk/bsf3/distribution/build.xml Sat Mar 24 19:13:41 2007
@@ -31,7 +31,10 @@
         <unzip src="${localRepository}/org/apache/bsf/bsf-engines/3.0-beta1-SNAPSHOT/bsf-engines-3.0-beta1-SNAPSHOT.jar" dest="${basedir}\target\bsf-all" overwrite="false"/>
         <unzip src="${localRepository}/org/apache/bsf/bsf-utils/3.0-beta1-SNAPSHOT/bsf-utils-3.0-beta1-SNAPSHOT.jar" dest="${basedir}\target\bsf-all" overwrite="false"/>
 
-        <zip destfile="${basedir}/target/bsf-all.jar" basedir="${basedir}\target\bsf-all" />
+        <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" />
 
         <!-- these are required for the mvn install command to work correctly -->
         <condition property="maven.suffix" value="">
@@ -42,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.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>

Added: jakarta/bsf/trunk/bsf3/distribution/src.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/src.xml?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/src.xml (added)
+++ jakarta/bsf/trunk/bsf3/distribution/src.xml Sat Mar 24 19:13:41 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  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.
+  -->
+<assembly>
+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+    <id>src</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+
+    <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>pom.xml</include>
+                <include>bsf-api/**/*</include>
+                <include>bsf-engines/**/*</include>
+                <include>bsf-utils/**/*</include>
+                <include>distribution/**/*</include>
+                <include>testing/**/*</include>
+            </includes>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+                <exclude>**/build</exclude>
+                <exclude>**/build/**/*</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.wtpmodules</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.settings/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: jakarta/bsf/trunk/bsf3/distribution/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/distribution/src.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: jakarta/bsf/trunk/bsf3/distribution/src.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE (added)
+++ jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE Sat Mar 24 19:13:41 2007
@@ -0,0 +1,250 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+======================================
+  LICENSES FOR INCLUDED DEPENDENCIES
+======================================
+
+All the source code for the Apache BSF project is released under the
+license above. Additionally, the Apache BSF binary distribution
+includes a number of third-party script engines which are released under
+the following BSD license:
+
+ ============================================================================
+                    The script engines BSD License
+ ============================================================================
+
+Copyright (c) 2006, Sun Microsystems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this 
+   list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+
+ - Neither the name of the Sun Microsystems, Inc. nor the names of 
+   contributors may be used to endorse or promote products derived from this 
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+DAMAGE.
+

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE (added)
+++ jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE Sat Mar 24 19:13:41 2007
@@ -0,0 +1,24 @@
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+*----------------------------------------------------------------------*
+* BSF3 was developed according to the JSR-223 specs, but has not yet   *
+* been tested via the JSR-223 TCK. BSF can therefore not be considered *
+* a compatible implementation of JSR-223.                              *
+*----------------------------------------------------------------------*
+
+The Apache BSF binary distribution includes software distributed under the
+BSD License. See the LICENSE file for details.
+
+COPYRIGHT NOTICES
+
+* The Apache BSF binary includes script engines under the following copyright:
+    Copyright (c) 2006, Sun Microsystems, Inc.
+
+
+
+
+
+

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/NOTICE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jakarta/bsf/trunk/bsf3/distribution/src/bin/README
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/distribution/src/bin/README?view=auto&rev=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/distribution/src/bin/README (added)
+++ jakarta/bsf/trunk/bsf3/distribution/src/bin/README Sat Mar 24 19:13:41 2007
@@ -0,0 +1,27 @@
+BSF 3 beta1
+-----------
+
+The BSF 3 binary release contains several jars:
+
+bsf-api-beta1.jar
+- this contains all the javax.script classes as defined in the
+  JSR-223 specification. This jar may be used as an application 
+  dependency when the application is using javax.script classes
+
+bsf-engines-beta1.jar
+- this contains several JSR-223 script engine implementations 
+  which enable a script language to be used via the javax.script
+  APIs. This jar does not include the actual script language 
+  implementations, these need to be obtained separately.
+
+bsf-utils-beta1.jar
+- this contains various BSF specific utilities which aid using
+  script languages from Java applications. 
+
+bsf-all-beta1.jar
+- this contains all the other BSF jars merged into a single jar for 
+  ease of use. If you're not sure which jar to use then use this one.
+
+BSF 3 is compatible with Java 1.4.2 and above. Specific script 
+languages may have further requirements on the Java version.  
+

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/bsf/trunk/bsf3/distribution/src/bin/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jakarta/bsf/trunk/bsf3/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/pom.xml?view=diff&rev=522145&r1=522144&r2=522145
==============================================================================
--- jakarta/bsf/trunk/bsf3/pom.xml (original)
+++ jakarta/bsf/trunk/bsf3/pom.xml Sat Mar 24 19:13:41 2007
@@ -33,6 +33,10 @@
     <packaging>pom</packaging>
     <url>http://jakarta.apache.org/bsf/</url>
 
+    <properties>
+        <bsf.version>3.0-beta1-SNAPSHOT</bsf.version>
+    </properties>
+
     <issueManagement>
         <url>http://issues.apache.org/jira/browse/BSF</url>
     </issueManagement>
@@ -74,6 +78,53 @@
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org/</url>
     </organization>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.1</version>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>distribution/bin.xml</descriptor>
+                                <descriptor>distribution/src.xml</descriptor>
+                            </descriptors>
+                            <finalName>bsf-${bsf.version}</finalName>
+                        </configuration>
+                    </plugin>
+
+                    <!--<plugin>-->
+                        <!--<artifactId>maven-site-plugin</artifactId>-->
+                        <!--<inherited>false</inherited>-->
+                    <!--</plugin>-->
+                    <!---->
+                    <!-- plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <attach>true</attach>
+                        </configuration>
+                    </plugin -->
+                </plugins>
+            </build>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+        </profile>
+    </profiles>
 
     <build>
         <defaultGoal>install</defaultGoal>



---------------------------------------------------------------------
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