You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/03 05:42:01 UTC
svn commit: r722770 - in /incubator/jspwiki/trunk: .classpath ChangeLog
build.xml
Author: ajaquith
Date: Tue Dec 2 20:42:01 2008
New Revision: 722770
URL: http://svn.apache.org/viewvc?rev=722770&view=rev
Log:
Checked in the Stripes code (about 220 classes, tests, JSPs and other files. All code compiles clean, but the JSPs do NOT work at the moment. Unit tests run clean except for some stray failing Stripes-related unit tests. See the file doc/README - Stripes Migration for some (repeat, SOME) details of what it all means. I'll sort out the JSP issues later this week.
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=722770&r1=722769&r2=722770&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Tue Dec 2 20:42:01 2008
@@ -37,7 +37,7 @@
<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
- <classpathentry kind="lib" path="lib/stripes-1.5.jar"/>
+ <classpathentry kind="lib" path="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
<classpathentry kind="lib" path="lib/jul-to-slf4j-1.5.6.jar"/>
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=722770&r1=722769&r2=722770&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Dec 2 20:42:01 2008
@@ -1,3 +1,15 @@
+2008-10-14 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-18
+
+ * Checked in the Stripes code (about 220 classes, tests, JSPs
+ and other files. All code compiles clean, but the JSPs do NOT
+ work at the moment. Unit tests run clean except for some
+ stray failing Stripes-related unit tests. See the file
+ doc/README - Stripes Migration for some (repeat, SOME) details
+ of what it all means. I'll sort out the JSP issues later this
+ week.
+
2008-11-06 Janne Jalkanen <ja...@apache.org>
* 3.0.0-svn-17
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=722770&r1=722769&r2=722770&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Tue Dec 2 20:42:01 2008
@@ -274,11 +274,40 @@
<link href="http://java.sun.com/products/javamail/javadocs/"/>
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<link href="http://www.jdom.org/docs/apidocs/"/>
+ <link href="http://stripes.sourceforge.net/docs/current/javadoc/"/>
<classpath refid="path.base" />
<classpath refid="path.tests" />
</javadoc>
</target>
+
+ <!-- ============================================================== -->
+
+ <!-- This target migrates Stripes JSPs -->
+
+ <target name="migrate" depends="jar,jartests">
+ <mkdir dir="build/migrated" />
+ <pathconvert property="cp" refid="path.tests"/>
+ <path id="srcfiles">
+ <fileset dir="src" includes="**/*.java" excludes="**/NoneActionBean.java" />
+ </path>
+ <pathconvert property="srcfiles" refid="srcfiles" pathsep=" "/>
+ <!-- Generate the Stripes SiteStructure doc -->
+ <exec executable="apt">
+ <arg line="-classpath ${cp} -nocompile"/>
+ <arg line="-factory net.sourceforge.stripes.tools.SiteStructureTool"/>
+ <arg line="-Astripes.output.file=sitemap.xml"/>
+ <arg line="${srcfiles}"/>
+ </exec>
+ <!-- Migrate the JSPs -->
+ <java classname="com.ecyrd.jspwiki.ui.stripes.JspMigrator" fork="yes" maxmemory="512m">
+ <classpath>
+ <path refid="path.tests" />
+ </classpath>
+ <arg value="src/webdocs" />
+ <arg value="build/migrated" />
+ </java>
+ </target>
<!-- ============================================================== -->