Author: snoopdave
Date: Sat Apr 21 07:04:15 2007
New Revision: 531032
URL: http://svn.apache.org/viewvc?view=rev&rev=531032
Log:
Fixing incorrect reference to $entry in themes, preparing for 3.0.1 RC3
Modified:
roller/branches/roller_3.0/nbproject/project.xml
roller/branches/roller_3.0/sign-release.sh
roller/branches/roller_3.0/web/themes/basic/Weblog.vm
roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm
roller/branches/roller_3.0/web/themes/sotto/Weblog.vm
Modified: roller/branches/roller_3.0/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.0/nbproject/project.xml?view=diff&rev=531032&r1=531031&r2=531032
==============================================================================
--- roller/branches/roller_3.0/nbproject/project.xml (original)
+++ roller/branches/roller_3.0/nbproject/project.xml Sat Apr 21 07:04:15 2007
@@ -34,11 +34,6 @@
<location>contrib/plugins/src</location>
</source-folder>
<source-folder>
- <label>tests</label>
- <type>java</type>
- <location>tests</location>
- </source-folder>
- <source-folder>
<label>generated/web</label>
<type>java</type>
<location>build/generated/web</location>
@@ -48,6 +43,11 @@
<type>java</type>
<location>build/generated/business</location>
</source-folder>
+ <source-folder>
+ <label>tests</label>
+ <type>java</type>
+ <location>tests</location>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -116,10 +116,6 @@
<location>contrib/plugins/src</location>
</source-folder>
<source-folder style="packages">
- <label>tests</label>
- <location>tests</location>
- </source-folder>
- <source-folder style="packages">
<label>generated/web</label>
<location>build/generated/web</location>
</source-folder>
@@ -127,6 +123,10 @@
<label>generated/business</label>
<location>build/generated/business</location>
</source-folder>
+ <source-folder style="packages">
+ <label>tests</label>
+ <location>tests</location>
+ </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -151,9 +151,15 @@
<source-level>1.4</source-level>
</compilation-unit>
<compilation-unit>
+ <package-root>build/generated/web</package-root>
+ <source-level>1.4</source-level>
+ </compilation-unit>
+ <compilation-unit>
+ <package-root>build/generated/business</package-root>
+ <source-level>1.4</source-level>
+ </compilation-unit>
+ <compilation-unit>
<package-root>tests</package-root>
- <unit-tests/>
- <classpath
mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servl
et.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/lib/jdom.jar:contrib/lib/ecs.jar:contrib/lib/jrcs-diff.jar:contrib/lib/JSPWiki.jar:contrib/lib/jython.jar:contrib/lib/oscache.jar:contrib/lib/radeox.jar:contrib/lib/textile4j-1.20.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar</classpath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: roller/branches/roller_3.0/sign-release.sh
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.0/sign-release.sh?view=diff&rev=531032&r1=531031&r2=531032
==============================================================================
--- roller/branches/roller_3.0/sign-release.sh (original)
+++ roller/branches/roller_3.0/sign-release.sh Sat Apr 21 07:04:15 2007
@@ -1,16 +1,16 @@
-export rcstring="-rc1"
+export rcstring="-rc3"
-cp dist/apache-roller-3.0-incubating.tar.gz
dist/apache-roller-3.0${rcstring}-incubating.tar.gz
-cp dist/apache-roller-3.0-incubating.zip
dist/apache-roller-3.0${rcstring}-incubating.zip
+cp dist/apache-roller-3.0.1-incubating.tar.gz
dist/apache-roller-3.0.1${rcstring}-incubating.tar.gz
+cp dist/apache-roller-3.0.1-incubating.zip
dist/apache-roller-3.0.1${rcstring}-incubating.zip
-cp dist/apache-roller-src-3.0-incubating.tar.gz
dist/apache-roller-src-3.0${rcstring}-incubating.tar.gz
-cp dist/apache-roller-src-3.0-incubating.zip
dist/apache-roller-src-3.0${rcstring}-incubating.zip
+cp dist/apache-roller-src-3.0.1-incubating.tar.gz
dist/apache-roller-src-3.0.1${rcstring}-incubating.tar.gz
+cp dist/apache-roller-src-3.0.1-incubating.zip
dist/apache-roller-src-3.0.1${rcstring}-incubating.zip
-gpg --armor --output dist/apache-roller-3.0-incubating.tar.gz.asc
--detach-sig dist/apache-roller-3.0${rcstring}-incubating.tar.gz
-gpg --armor --output dist/apache-roller-3.0-incubating.zip.asc
--detach-sig dist/apache-roller-3.0${rcstring}-incubating.zip
+gpg --armor --output dist/apache-roller-3.0.1-incubating.tar.gz.asc
--detach-sig dist/apache-roller-3.0.1${rcstring}-incubating.tar.gz
+gpg --armor --output dist/apache-roller-3.0.1-incubating.zip.asc
--detach-sig dist/apache-roller-3.0.1${rcstring}-incubating.zip
-gpg --armor --output dist/apache-roller-src-3.0-incubating.tar.gz.asc
--detach-sig dist/apache-roller-src-3.0${rcstring}-incubating.tar.gz
-gpg --armor --output dist/apache-roller-src-3.0-incubating.zip.asc
--detach-sig dist/apache-roller-src-3.0${rcstring}-incubating.zip
+gpg --armor --output dist/apache-roller-src-3.0.1-incubating.tar.gz.asc
--detach-sig dist/apache-roller-src-3.0.1${rcstring}-incubating.tar.gz
+gpg --armor --output dist/apache-roller-src-3.0.1-incubating.zip.asc
--detach-sig dist/apache-roller-src-3.0.1${rcstring}-incubating.zip
Modified: roller/branches/roller_3.0/web/themes/basic/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.0/web/themes/basic/Weblog.vm?view=diff&rev=531032&r1=531031&r2=531032
==============================================================================
--- roller/branches/roller_3.0/web/themes/basic/Weblog.vm (original)
+++ roller/branches/roller_3.0/web/themes/basic/Weblog.vm Sat Apr 21 07:04:15
2007
@@ -30,8 +30,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
</div>
Modified: roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm?view=diff&rev=531032&r1=531031&r2=531032
==============================================================================
--- roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm (original)
+++ roller/branches/roller_3.0/web/themes/brushedmetal/Weblog.vm Sat Apr 21
07:04:15 2007
@@ -52,8 +52,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
<div id="footer">
Modified: roller/branches/roller_3.0/web/themes/sotto/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.0/web/themes/sotto/Weblog.vm?view=diff&rev=531032&r1=531031&r2=531032
==============================================================================
--- roller/branches/roller_3.0/web/themes/sotto/Weblog.vm (original)
+++ roller/branches/roller_3.0/web/themes/sotto/Weblog.vm Sat Apr 21 07:04:15
2007
@@ -39,8 +39,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
</div>
