svn commit: r630656 - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: .project build.properties doc/Java 5 changes

[aj...@apache.org]

Author: ajaquith
Date: Sun Feb 24 10:35:15 2008
New Revision: 630656

URL: http://svn.apache.org/viewvc?rev=630656&view=rev
Log:
Checked in ARJ-specific build properties; incremented Java 5 changes file.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Java 5 changes

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project?rev=630656&r1=630655&r2=630656&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.project Sun Feb 24 10:35:15 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>JSPWiki</name>
+	<name>JSPWiki-SVN-Stripes</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties?rev=630656&r1=630655&r2=630656&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties Sun Feb 24 10:35:15 2008
@@ -7,10 +7,10 @@
 #  jspwiki.properties-file when it is run.
 #
 @appname@=JSPWiki
-@pagedir@=/p/web/www-data/jspwiki/
-@logfile@=/tmp/jspwiki.log
-@securitylog@=/tmp/security.log
-@spamlog@=/tmp/spamlog.log
+@pagedir@=/Users/arj/Library/Application Support/JSPWiki/repository-stripes
+@logfile@=/Users/arj/Library/Logs/JSPWiki/jspwiki-stripes.log
+@securitylog@=/Users/arj/Library/Logs/JSPWiki/security-stripes.log
+@spamlog@=/Users/arj/Library/Logs/JSPWiki/spamlog-stripes.log
 
 @tests.pagedir@=/tmp/testrepository
 @tests.workdir@=/tmp/testworkdir
@@ -39,8 +39,8 @@
 #  If you are running web tests, these need to be set to your
 #  Tomcat admin name and password.
 #
-tomcat.admin = admin
-tomcat.password = greyroot
+tomcat.admin=tomcat
+tomcat.password=tomcat
 tomcat.host = localhost
 tomcat.port = 8080
 tomcat.protocol = http
@@ -56,6 +56,7 @@
 jdbc.admin.password=
 jdbc.user.id=jspwiki
 jdbc.user.password=password
+install.fulldir=/usr/share/java/tomcat/webapps
 
 #
 #  Running webtests

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Java 5 changes
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Java%205%20changes?rev=630656&r1=630655&r2=630656&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Java 5 changes (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Java 5 changes Sun Feb 24 10:35:15 2008
@@ -327,6 +327,8 @@
 Instead, you can simply use:
 <fmt:message key="attach.tab"/>
 
+...except that you can't, at least not in attributes! Damn.
+
 
 Stripes layout system
 ---------------------
@@ -357,5 +359,5 @@
 ContentTag looks quite screwed up! (shouldn't append the *Content.jsp suffix, should it?)
 FeedDiscoveryTeg generates URLs in a funny way...
 Not sure about ResolutionException and RedirectException... committed them anyway. 
-Do we really need to add in StripesResources if the contents are already in the i18n defaults file?
 
+Selenium tests are temporarily borked because we use the old JSPs.