You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/03/02 16:06:19 UTC
svn commit: r513801 - in /incubator/roller/branches/roller_4.0: ./
apps/planet/src/java/org/apache/roller/planet/util/
apps/planet/src/java/org/apache/roller/util/ metadata/xdoclet/
src/org/apache/roller/business/ src/org/apache/roller/business/pings/ ...
Author: snoopdave
Date: Fri Mar 2 07:06:17 2007
New Revision: 513801
URL: http://svn.apache.org/viewvc?view=rev&rev=513801
Log:
Merging latest from trunk: Javadoc fix and install guide update
Modified:
incubator/roller/branches/roller_4.0/README.txt
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
incubator/roller/branches/roller_4.0/build.xml
incubator/roller/branches/roller_4.0/merges.txt
incubator/roller/branches/roller_4.0/metadata/xdoclet/web-resource-env-refs.xml
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/ConfigManager.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/business/pings/PingQueueTask.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/package.html
incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/tags/DateMacro.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/util/Utilities.java
incubator/roller/branches/roller_4.0/src/org/apache/roller/webservices/atomprotocol/AtomService.java
incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/footer.jsp
incubator/roller/branches/roller_4.0/web/WEB-INF/sun-web.xml
incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm
Modified: incubator/roller/branches/roller_4.0/README.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/README.txt?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/README.txt (original)
+++ incubator/roller/branches/roller_4.0/README.txt Fri Mar 2 07:06:17 2007
@@ -1,13 +1,5 @@
README.txt
- Roller is an effort undergoing incubation at the Apache Software
- Foundation (ASF). Incubation is required of all newly accepted projects
- until a further review indicates that the infrastructure, communications,
- and decision making process have stabilized in a manner consistent with
- other successful ASF projects. While incubation status is not necessarily a
- reflection of the completeness or stability of the code, it does indicate
- that the project has yet to be fully endorsed by the ASF.
-
To install Roller, follow the instructions in the Installation Guide,
which is available in three formats:
@@ -29,8 +21,7 @@
HTML - docs/template/generated/roller-template-guide.html
PDF - docs/template/generated/roller-template-guide.pdf
OpenOffice - docs/template/roller-template-guide.odt
-
-
+
See also
NOTICE.txt - Roller credits and copyright notices
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java Fri Mar 2 07:06:17 2007
@@ -624,7 +624,7 @@
*
* WARNING: this method has serious performance problems a
*
- * @author Alexis Moussine-Pouchkine <al...@france.sun.com>
+ * @author Alexis Moussine-Pouchkine (alexis.moussine-pouchkine@france.sun.com)
* @author Lance Lavandowska
* @param str the String object to modify
* @return the new String object without the HTML "visible" tags
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/util/OldUtilities.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/util/OldUtilities.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/util/OldUtilities.java Fri Mar 2 07:06:17 2007
@@ -529,7 +529,7 @@
*
* WARNING: this method has serious performance problems a
*
- * @author Alexis Moussine-Pouchkine <al...@france.sun.com>
+ * @author Alexis Moussine-Pouchkine (alexis.moussine-pouchkine@france.sun.com)
* @author Lance Lavandowska
* @param str the String object to modify
* @return the new String object without the HTML "visible" tags
Modified: incubator/roller/branches/roller_4.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/build.xml?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/build.xml (original)
+++ incubator/roller/branches/roller_4.0/build.xml Fri Mar 2 07:06:17 2007
@@ -531,26 +531,25 @@
<target name="javadoc">
<mkdir dir="${build.javadoc}"/>
<javadoc
- bottom="Copyright (C) David M Johnson"
+ doctitle="Javadocs: Apache Roller ${ro.version}"
+ bottom="Copyright 2007 Apache Software Foundation"
classpathref="javadoc.path"
destdir="${build.javadoc}"
- doctitle="Javadocs: Roller Weblogger ${ro.version}"
private="false"
version="false"
- windowtitle="Javadocs: Roller Weblogger ${ro.version}">
+ verbose="false"
+ windowtitle="Javadocs: Apache Roller - Weblogger ${ro.version}">
<sourcepath>
<pathelement path="./src"/>
- <pathelement path="${ro.build}/generated/src.business"/>
- <pathelement path="${ro.build}/generated/src.presentation"/>
+ <pathelement path="${ro.build}/generated/business"/>
+ <pathelement path="${ro.build}/generated/presentation"/>
</sourcepath>
<packageset dir="src" defaultexcludes="yes">
<include name="org/apache/roller/**" />
- <exclude name="org/apache/roller/business/prevayler/**" />
</packageset>
<link href="http://java.sun.com/j2se/1.4/docs/api/"/>
<link href="http://java.sun.com/products/servlet/2.3/javadoc/"/>
<link href="http://jakarta.apache.org/struts/doc-1.0.2/api"/>
- <link href="http://hibernate.bluemars.net/hib_docs/api/"/>
</javadoc>
<copy todir="${build.javadoc}">
<fileset dir="${basedir}/src">
Modified: incubator/roller/branches/roller_4.0/merges.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/merges.txt?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/merges.txt (original)
+++ incubator/roller/branches/roller_4.0/merges.txt Fri Mar 2 07:06:17 2007
@@ -3,6 +3,12 @@
Temporary file to track merges from trunk into the roller_4.0 branch.
+March 2, 2006: merging latest from trunk, install guide updates
+svn merge -r 513786:513798 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
+March 2, 2006: merging latest from trunk, incl. Javadocs fix
+svn merge -r 512379:513785 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
Feb. 27, 2007: merge latest from trunk
svn merge -r 508659:512378 https://svn.apache.org/repos/asf/incubator/roller/trunk
Modified: incubator/roller/branches/roller_4.0/metadata/xdoclet/web-resource-env-refs.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/metadata/xdoclet/web-resource-env-refs.xml?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/metadata/xdoclet/web-resource-env-refs.xml (original)
+++ incubator/roller/branches/roller_4.0/metadata/xdoclet/web-resource-env-refs.xml Fri Mar 2 07:06:17 2007
@@ -1,14 +1,12 @@
-<!-- Web app resource refs. -->
+ <!-- jndi resources -->
<resource-ref>
- <res-ref-name>jdbc/rollerdb</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
+ <res-ref-name>jdbc/rollerdb</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
</resource-ref>
-<!-- Uncomment this for email notification of comments
<resource-ref>
<res-ref-name>mail/Session</res-ref-name>
<res-type>javax.mail.Session</res-type>
<res-auth>Container</res-auth>
- </resource-ref>
--->
\ No newline at end of file
+ </resource-ref>
\ No newline at end of file
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/ConfigManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/ConfigManager.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/ConfigManager.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/ConfigManager.java Fri Mar 2 07:06:17 2007
@@ -26,7 +26,7 @@
/**
* Manages Roller configuration
- * @deprecated Replaced by {@link RollerProperties}.
+ * @deprecated Replaced by {@link org.apache.roller.business.PropertiesManager}.
*/
public interface ConfigManager extends Serializable
{
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/business/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/business/pings/PingQueueTask.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/business/pings/PingQueueTask.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/business/pings/PingQueueTask.java Fri Mar 2 07:06:17 2007
@@ -32,7 +32,7 @@
/**
* Task for processing the ping queue at fixed intervals. This is set up during context initialization by {@link
- * RollerContext}. The queue processing interval is currently set from the configuration {@link
+ * org.apache.roller.ui.core.RollerContext}. The queue processing interval is currently set from the configuration {@link
* org.apache.roller.config.PingConfig} at startup time only.
*
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/package.html
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/package.html?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/package.html (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/pojos/package.html Fri Mar 2 07:06:17 2007
@@ -23,11 +23,6 @@
<body>
Persistent objects stored/retrieved by business layer.
-<p>At this level we avoid dependance on specific persistence engines
-(e.g. Hibernate). We do this by using an interface named
-{@link org.apache.roller.business.PersistenceStrategy PersistenceStrategy}
-to store, retrieve and remove POJOS.</p>
-
<img src="../business/roller-persistence.png"
alt="diagram of Roller persistent object and strategy" />
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/struts/actions/BasePingTargetsAction.java Fri Mar 2 07:06:17 2007
@@ -312,9 +312,7 @@
/**
* Helper defined by the subclass to determine if user has adequate
- * rights for the action. This and the
- * {@link org.apache.roller.pojos.PingTargetData#canSave()} method determine the
- * access control for the action.
+ * rights for the action. This helps determine the access control for the action.
*/
protected abstract boolean hasRequiredRights(RollerRequest rreq, WebsiteData website) throws RollerException;
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/tags/DateMacro.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/tags/DateMacro.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/tags/DateMacro.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/authoring/tags/DateMacro.java Fri Mar 2 07:06:17 2007
@@ -22,9 +22,6 @@
/** For formatting a date using patterns from
* {@link java.text.SimpleDateFormat SimpleDateFormat}.
- * @deprecated Use methods on
- * {@link org.apache.roller.presentation.weblog.WeblogEntryDataEx WeblogEntryDataEx}
- * instead.
*/
public class DateMacro
{
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java Fri Mar 2 07:06:17 2007
@@ -50,7 +50,7 @@
/**
* Roller's Trackback server implementation. POSTing to this Servlet will add a
* Trackback to a Weblog Entry. For more info on Trackback, read the spec:
- * <a href="http://www.movabletype.org/docs/mttrackback.html>MT Trackback</a>.
+ * <a href="http://www.movabletype.org/docs/mttrackback.html">MT Trackback</a>.
*
* @web.servlet name="TrackbackServlet"
* @web.servlet-mapping url-pattern="/roller-ui/rendering/trackback/*"
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java Fri Mar 2 07:06:17 2007
@@ -529,7 +529,7 @@
*
* WARNING: this method has serious performance problems a
*
- * @author Alexis Moussine-Pouchkine <al...@france.sun.com>
+ * @author Alexis Moussine-Pouchkine (alexis.moussine-pouchkine@france.sun.com)
* @author Lance Lavandowska
* @param str the String object to modify
* @return the new String object without the HTML "visible" tags
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/util/Utilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/util/Utilities.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/util/Utilities.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/util/Utilities.java Fri Mar 2 07:06:17 2007
@@ -624,7 +624,7 @@
*
* WARNING: this method has serious performance problems a
*
- * @author Alexis Moussine-Pouchkine <al...@france.sun.com>
+ * @author Alexis Moussine-Pouchkine (alexis.moussine-pouchkine@france.sun.com)
* @author Lance Lavandowska
* @param str the String object to modify
* @return the new String object without the HTML "visible" tags
Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/webservices/atomprotocol/AtomService.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/webservices/atomprotocol/AtomService.java?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/webservices/atomprotocol/AtomService.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/webservices/atomprotocol/AtomService.java Fri Mar 2 07:06:17 2007
@@ -274,7 +274,7 @@
/**
- * Represents an <atom:category> object
+ * Represents an <atom:category> object
*//*
atomCategory =
element atom:category {
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/footer.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/footer.jsp?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/footer.jsp (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/jsps/tiles/footer.jsp Fri Mar 2 07:06:17 2007
@@ -17,7 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
-Powered by <a href="http://www.rollerweblogger.org">Apache Roller (incubating)</a>
+Powered by <a href="http://roller.apache.org">Apache Roller</a>
<%= RollerFactory.getRoller().getVersion() %> |
<a href="http://opensource2.atlassian.com/projects/roller/">
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/sun-web.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/sun-web.xml?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/sun-web.xml (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/sun-web.xml Fri Mar 2 07:06:17 2007
@@ -13,5 +13,10 @@
<res-ref-name>jdbc/rollerdb</res-ref-name>
<jndi-name>jdbc/rollerdb</jndi-name>
</resource-ref>
+
+ <resource-ref>
+ <res-ref-name>mail/Session</res-ref-name>
+ <jndi-name>mail/Session</jndi-name>
+ </resource-ref>
</sun-web-app>
Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm?view=diff&rev=513801&r1=513800&r2=513801
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm Fri Mar 2 07:06:17 2007
@@ -265,7 +265,7 @@
</li>
<li>
<label class="desc">$text.get( "macro.weblog.yourcomment" )</label>
- <textarea name="content" class="textarea large" cols="" rows="">$utils.escapeHTML($cform.content)</textarea>
+ <textarea name="content" class="textarea large" cols="40" rows="10">$utils.escapeHTML($cform.content)</textarea>
</li>
<li class="info">
<span class="comments-syntax-indicator">