Author: mrdon
Date: Sat Dec  3 20:39:17 2005
New Revision: 353813

URL: http://svn.apache.org/viewcvs?rev=353813&view=rev
Log:
Minor cleanups, changed bsh to 1.3.0, marking for 1.0.0 release

Modified:
    struts/scripting/trunk/build.xml
    struts/scripting/trunk/maven.xml
    struts/scripting/trunk/project.xml

Modified: struts/scripting/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/scripting/trunk/build.xml?rev=353813&r1=353812&r2=353813&view=diff
==============================================================================
--- struts/scripting/trunk/build.xml (original)
+++ struts/scripting/trunk/build.xml Sat Dec  3 20:39:17 2005
@@ -23,7 +23,7 @@
 
     <!-- application information -->
     <property name="app.name"           value="struts-scripting" />
-    <property name="app.version"        value="1.0-dev" />
+    <property name="app.version"        value="1.0.0" />
 
     <!-- The base directory for distribution targets -->
     <property name="dist.dir"           value="./dist" />
@@ -85,9 +85,9 @@
               ignoreerrors="true" 
               src="http://www.ibiblio.org/maven/bsf/jars/bsf-2.3.0.jar"/> 
 
-        <get dest="${lib.core}/bsh-2.0b1.jar" usetimestamp="true" 
+        <get dest="${lib.core}/bsh-1.3.0.jar" usetimestamp="true" 
               ignoreerrors="true" 
-              src="http://www.ibiblio.org/maven/bsh/jars/bsh-2.0b1.jar"/> 
+              src="http://www.ibiblio.org/maven/bsh/jars/bsh-1.3.0.jar"/> 
 
         <get dest="${lib.core}/jakarta-oro-2.0.7.jar" usetimestamp="true" 
               ignoreerrors="true" 

Modified: struts/scripting/trunk/maven.xml
URL: 
http://svn.apache.org/viewcvs/struts/scripting/trunk/maven.xml?rev=353813&r1=353812&r2=353813&view=diff
==============================================================================
--- struts/scripting/trunk/maven.xml (original)
+++ struts/scripting/trunk/maven.xml Sat Dec  3 20:39:17 2005
@@ -7,6 +7,7 @@
 
    <postGoal name="dist">
                <attainGoal name="jar:install"/>
+               <attainGoal name="readme"/>
        </postGoal>
 
        <postGoal name="dist:prepare-bin-filesystem">
@@ -14,6 +15,7 @@
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
                  <ant:fileset dir="${basedir}">
                        <ant:include name="NOTICE*"/>
+                       <ant:include name="README.txt"/>
                  </ant:fileset>
                </ant:copy>
    
@@ -29,21 +31,13 @@
                <ant:copy todir="${maven.dist.src.assembly.dir}">
                  <ant:fileset dir="${basedir}">
                        <ant:include name="NOTICE*"/>
+                       <ant:include name="README.txt"/>
                  </ant:fileset>
                </ant:copy>
       
        </postGoal>
 
     <goal name="readme" description="Generates readme">
-        <!--
-        <ant:java classname="org.mozilla.javascript.tools.shell.Main" 
fork="true">
-            <ant:classpath>
-                <ant:path refid="maven.dependency.classpath"/>
-            </ant:classpath>
-            <ant:arg value="${basedir}/src/build/releasenotes.js" />
-            <ant:arg value="${basedir}" />
-        </ant:java>    
-        -->
         <ant:java classname="org.apache.xalan.xslt.Process" fork="true">
             <ant:classpath>
                 <ant:path refid="maven.dependency.classpath"/>

Modified: struts/scripting/trunk/project.xml
URL: 
http://svn.apache.org/viewcvs/struts/scripting/trunk/project.xml?rev=353813&r1=353812&r2=353813&view=diff
==============================================================================
--- struts/scripting/trunk/project.xml (original)
+++ struts/scripting/trunk/project.xml Sat Dec  3 20:39:17 2005
@@ -28,7 +28,7 @@
 
   <id>struts-scripting</id>
   <name>Struts Scripting</name>
-  <currentVersion>1.0-dev</currentVersion>
+  <currentVersion>1.0.0</currentVersion>
   
   <inceptionYear>2003</inceptionYear>
   <package>org.apache.struts.scripting</package>
@@ -45,7 +45,7 @@
     This project allows Struts Actions to be written in the scripting language 
     of one's choice rather than as Java classes. It uses the Beans Scripting 
     Framework to allow scripts to be written in any language BSF supports like 
-    Perl, Python, Ruby, JavaScript, BeanShell, and I believe even VBScript.
+    Perl, Python, Ruby, JavaScript, BeanShell, and even VBScript.
   </description>
   
   <siteAddress>people.apache.org</siteAddress>
@@ -145,7 +145,7 @@
     <dependency>
       <groupId>bsh</groupId>
       <artifactId>bsh</artifactId>
-      <version>1.2b7</version>
+      <version>1.3.0</version>
       <properties>
         <war.bundle>true</war.bundle>
         <cactus.bundle>true</cactus.bundle>
@@ -158,19 +158,19 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
-      <url>http://jakarta.apache.org/commons/logging/</url>
+      <url>http://jakarta.apache.org/commons/lang/</url>
     </dependency>
 
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <version>2.7.0</version>
-      <url>http://jakarta.apache.org/commons/logging/</url>
+      <url>http://xalan.apache.org/</url>
     </dependency>
  </dependencies>
   
   <build>
-    <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+    <nagEmailAddress>[email protected]</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to