You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2005/12/04 08:43:33 UTC
svn commit: r353830 - in /struts/scripting/trunk: ./
src/java/org/apache/struts/scripting/ xdocs/
Author: mrdon
Date: Sat Dec 3 23:43:30 2005
New Revision: 353830
URL: http://svn.apache.org/viewcvs?rev=353830&view=rev
Log:
Added NOTICE.txt to jar, fixed mismatched jars in distro and example,
fixed download link, cleaned imports
Modified:
struts/scripting/trunk/build.xml
struts/scripting/trunk/maven.xml
struts/scripting/trunk/project.xml
struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
struts/scripting/trunk/xdocs/navigation.xml
Modified: struts/scripting/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/build.xml?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/build.xml (original)
+++ struts/scripting/trunk/build.xml Sat Dec 3 23:43:30 2005
@@ -125,7 +125,7 @@
The "prepare" target creates a directory structure in the build target
area for the unpacked files associated with this web application
-->
- <target name="prepare" depends="init, clean, download-dependencies"
+ <target name="prepare" depends="init, download-dependencies"
description="Prepare target directory">
<echo message="Processing app ${app.name}"/>
<mkdir dir="${build.dir}" />
@@ -216,7 +216,7 @@
your completed web application, suitable for deployment on any
compatible servlet container.
-->
- <target name="jar" depends="compile"
+ <target name="jar" depends="compile" unless="nojar"
description="Create jar">
<echo message="Processing jarfile ${app.name}"/>
<jar jarfile="${dist.dir}/${app.jar}"
Modified: struts/scripting/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/maven.xml?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/maven.xml (original)
+++ struts/scripting/trunk/maven.xml Sat Dec 3 23:43:30 2005
@@ -5,25 +5,41 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven">
+
<postGoal name="dist">
<attainGoal name="jar:install"/>
</postGoal>
<postGoal name="dist:prepare-bin-filesystem">
+ <attainGoal name="jar:jar"/>
<attainGoal name="readme"/>
+ <ant:echo message="jar ${maven.build.dir}/${maven.final.name}.jar" />
<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>
-
- <ant:ant dir="${basedir}" antfile="build.xml" target="example" />
-
- <ant:copy file="dist/struts-example.war"
+
+ <ant:mkdir dir="${basedir}/dist" />
+ <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
+ todir="${basedir}/dist" />
+ <ant:ant dir="${basedir}" antfile="build.xml" target="example">
+ <ant:property name="nojar" value="nojar" />
+ </ant:ant>
+
+ <!--
+ <ant:unzip src="${basedir}/dist/struts-example.war"
+ dest="${basedir}/dist/tmp" />
+ <ant:copy file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar"
+ todir="${basedir}/dist/tmp/WEB-INF/lib" />
+ <ant:zip destfile="${basedir}/dist/struts-example.war"
+ basedir="${basedir}/dist/tmp" />
+ -->
+ <ant:copy file="${basedir}/dist/struts-example.war"
todir="${maven.dist.bin.assembly.dir}" />
-
+
</postGoal>
<postGoal name="dist:prepare-src-filesystem">
@@ -32,6 +48,7 @@
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir="${basedir}">
<ant:include name="NOTICE*"/>
+ <ant:include name="struts_checks.xml"/>
<ant:include name="README.txt"/>
<ant:include name="xdocs/**"/>
</ant:fileset>
Modified: struts/scripting/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/project.xml?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/project.xml (original)
+++ struts/scripting/trunk/project.xml Sat Dec 3 23:43:30 2005
@@ -185,7 +185,16 @@
<include>**/Test*.java</include>
</includes>
</unitTest>
-
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+
</build>
<reports>
Modified: struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java (original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/BSFManagerFilter.java Sat Dec 3 23:43:30 2005
@@ -1,7 +1,11 @@
package org.apache.struts.scripting;
-import org.apache.bsf.BSFManager;
+// util imports:
import java.util.Properties;
+
+// misc imports:
+import org.apache.bsf.BSFManager;
+
/**
* Defines a class that wants to manipulate the contents of the scripting
Modified: struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java (original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/RequestToVariableFilter.java Sat Dec 3 23:43:30 2005
@@ -1,12 +1,17 @@
package org.apache.struts.scripting;
-import org.apache.bsf.BSFManager;
-import org.apache.bsf.BSFException;
+// util imports:
+import java.util.Enumeration;
import java.util.Properties;
+
+// logging imports:
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+// misc imports:
import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
/**
Modified: struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java (original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/ScriptAction.java Sat Dec 3 23:43:30 2005
@@ -1,26 +1,34 @@
package org.apache.struts.scripting;
-import java.io.*;
+// util imports:
import java.util.*;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.bsf.BSFManager;
-import org.apache.bsf.BSFException;
-import org.apache.bsf.util.IOUtils;
+// io imports:
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+// logging imports:
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+// struts imports:
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessages;
+
+// misc imports:
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.IOUtils;
/**
Modified: struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java (original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/StrutsInfo.java Sat Dec 3 23:43:30 2005
@@ -1,9 +1,11 @@
package org.apache.struts.scripting;
-import org.apache.struts.action.ActionForward;
+// struts imports:
import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
+
/**
* Holds Struts objects
Modified: struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java (original)
+++ struts/scripting/trunk/src/java/org/apache/struts/scripting/TestFilter.java Sat Dec 3 23:43:30 2005
@@ -1,9 +1,15 @@
package org.apache.struts.scripting;
-import org.apache.bsf.BSFManager;
+// util imports:
import java.util.Properties;
+
+// logging imports:
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+// misc imports:
+import org.apache.bsf.BSFManager;
+
/**
* Tests to make sure the filtering system is working
Modified: struts/scripting/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/scripting/trunk/xdocs/navigation.xml?rev=353830&r1=353829&r2=353830&view=diff
==============================================================================
--- struts/scripting/trunk/xdocs/navigation.xml (original)
+++ struts/scripting/trunk/xdocs/navigation.xml Sat Dec 3 23:43:30 2005
@@ -8,7 +8,8 @@
<item name="Documentation" href="index.html#documentation"/>
<item name="User Guide" href="user-guide.html"/>
<item name="Source Guide" href="source-guide.html"/>
- <item name="Download (Sourceforge)" href="http://sourceforge.net/project/showfiles.php?group_id=49385&package_id=84734"/>
+ <item name="Download" href="http://struts.apache.org/acquiring.html"/>
+ <item name="Download (old)" href="http://sourceforge.net/project/showfiles.php?group_id=49385&package_id=84734"/>
</menu>
<menu name="Quick Links">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org