incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Harry Metske <harry.met...@gmail.com>
Subject Re: svn commit: r749739 - in /incubator/jspwiki/trunk: ./ src/java/org/apache/wiki/ src/java/org/apache/wiki/action/ src/java/org/apache/wiki/attachment/ src/java/org/apache/wiki/content/ src/java/org/apache/wiki/tags/
Date Tue, 03 Mar 2009 20:52:02 GMT
sorry, I'm now sitting in a corner silently crying :-(

 I'll keep my hands off it......

/Harry

2009/3/3 Janne Jalkanen <Janne.Jalkanen@ecyrd.com>

>
> Please refrain from editing ContentManager for now. It *will* have loads of
> warnings because I am constantly changing it and I just hate the
> conflicts...
>
> /Janne
>
> On Mar 3, 2009, at 22:43 , metskem@apache.org wrote:
>
>  Author: metskem
>> Date: Tue Mar  3 20:43:24 2009
>> New Revision: 749739
>>
>> URL: http://svn.apache.org/viewvc?rev=749739&view=rev
>> Log:
>> 3.0.0-svn-77
>>
>> * Get rid of all javadoc warnings
>> * added  forkmode="once" maxmemory="512m" to build.xml's tests target
>>
>> Modified:
>>   incubator/jspwiki/trunk/.classpath
>>   incubator/jspwiki/trunk/ChangeLog
>>   incubator/jspwiki/trunk/build.xml
>>   incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
>>   incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
>>   incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java
>>
>> Modified: incubator/jspwiki/trunk/.classpath
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/.classpath (original)
>> +++ incubator/jspwiki/trunk/.classpath Tue Mar  3 20:43:24 2009
>> @@ -1,7 +1,7 @@
>> <?xml version="1.0" encoding="UTF-8"?>
>> <classpath>
>>        <classpathentry kind="src" path="src/java"/>
>> -       <classpathentry kind="src" output="build/testclasses"
>> path="tests/java"/>
>> +       <classpathentry excluding="**/package.html" kind="src"
>> output="build/testclasses" path="tests/java"/>
>>        <classpathentry kind="con"
>> path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
>>        <classpathentry kind="con"
>> path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache
>> Tomcat v5.5"/>
>>        <classpathentry kind="con"
>> path="org.eclipse.jst.j2ee.internal.web.container"/>
>>
>> Modified: incubator/jspwiki/trunk/ChangeLog
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/ChangeLog (original)
>> +++ incubator/jspwiki/trunk/ChangeLog Tue Mar  3 20:43:24 2009
>> @@ -1,3 +1,11 @@
>> +2009-03-03  Harry Metske <metskem@apache.org>
>> +
>> +        * 3.0.0-svn-77
>> +
>> +        * Get rid of all javadoc warnings
>> +
>> +        * added  forkmode="once" maxmemory="512m" to build.xml's tests
>> target
>> +
>> 2009-03-02  Harry Metske <metskem@apache.org>
>>
>>        * 3.0.0-svn-76
>>
>> Modified: incubator/jspwiki/trunk/build.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/build.xml (original)
>> +++ incubator/jspwiki/trunk/build.xml Tue Mar  3 20:43:24 2009
>> @@ -283,7 +283,6 @@
>>      <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>
>> @@ -712,7 +711,7 @@
>>  <target name="tests" depends="jar,tests-init,jartests,tests-db-init"
>>          description="Runs the JUnit tests.">
>>
>> -    <junit printsummary="yes" haltonfailure="no" fork="yes"
>> maxmemory="128m">
>> +    <junit printsummary="yes" haltonfailure="no" fork="yes"
>> forkmode="once" maxmemory="512m">
>>        <classpath>
>>           <path refid="path.tests" />
>>        </classpath>
>>
>> Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
>> (original)
>> +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Tue Mar
>>  3 20:43:24 2009
>> @@ -77,7 +77,7 @@
>>     *  <p>
>>     *  If the build identifier is empty, it is not added.
>>     */
>> -    public static final String     BUILD         = "76";
>> +    public static final String     BUILD         = "77";
>>
>>    /**
>>     *  This is the generic version string you should use
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
>> Tue Mar  3 20:43:24 2009
>> @@ -55,7 +55,7 @@
>>    /**
>>     * Handler method that uploads a new attachment to the ViewActionBean.
>>     *
>> -     * @return
>> +     * @return {@link Resolution}
>>     */
>>    @HandlesEvent( "upload" )
>>    @HandlerPermission( permissionClass = PagePermission.class, target =
>> "${page.qualifiedName}", actions = PagePermission.VIEW_ACTION )
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java
>> Tue Mar  3 20:43:24 2009
>> @@ -33,6 +33,7 @@
>> import javax.servlet.ServletConfig;
>> import javax.servlet.ServletContext;
>> import javax.servlet.ServletException;
>> +import javax.servlet.http.HttpServlet;
>> import javax.servlet.http.HttpServletRequest;
>> import javax.servlet.http.HttpServletResponse;
>>
>> @@ -72,7 +73,7 @@
>>  *
>>  *  @since 1.9.45.
>>  */
>> -public class AttachmentServlet
>> +public class AttachmentServlet extends HttpServlet
>> {
>>    private static final int BUFFER_SIZE = 8192;
>>
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
>> Tue Mar  3 20:43:24 2009
>> @@ -308,7 +308,6 @@
>>     *  please see {@link ReferenceManager#findCreated()}, which is
>> probably a lot
>>     *  faster.  This method may cause repository access.
>>     *
>> -     *  @param context The Wikicontext
>>     *  @param space Name of the Wiki space.  May be null, in which case
>> gets all spaces
>>     *  @return A Collection of WikiPage objects.
>>     *  @throws ProviderException If the backend has problems.
>> @@ -538,7 +537,6 @@
>>     *  Gets a version history of page.  Each element in the returned
>>     *  List is a WikiPage.
>>     *
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param path The name of the page to fetch history for
>>     *  @return If the page does not exist, returns null, otherwise a List
>>     *          of WikiPages.
>> @@ -592,7 +590,6 @@
>>     *  it swallows the ProviderException and returns -1 instead of
>>     *  any problems.
>>     *
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param space Name of the Wiki space.  May be null, in which
>>     *  case all spaces will be counted
>>     *  @return The number of pages, or -1, if there is an error.
>> @@ -614,7 +611,6 @@
>>    /**
>>     *  Returns true, if the page exists (any version).
>>     *
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param wikiPath  the {@link WikiName} to check for
>>     *  @return A boolean value describing the existence of a page
>>     *  @throws ProviderException If the backend fails or the wikiPath is
>> illegal.
>> @@ -646,7 +642,6 @@
>>     *  Checks for existence of a specific page and version.
>>     *
>>     *  @since 2.3.29
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param wikiPath  the {@link WikiName} to check for
>>     *  @param version The version to check
>>     *  @return <code>true</code> if the page exists, <code>false</code>
>> otherwise
>> @@ -967,7 +962,6 @@
>>     *  Adds new content to the repository.  To update, get a page, modify
>>     *  it, then store it back using save().
>>     *
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param path the WikiName
>>     *  @param contentType the type of content
>>     *  @return the {@link JCRWikiPage}
>> @@ -994,7 +988,6 @@
>>    /**
>>     *  Get content from the repository.
>>     *
>> -     *  @param context The {@link WikiContext} to use
>>     *  @param path the path
>>     *  @return the {@link JCRWikiPage}
>>     *  @throws ProviderException If the backend fails.
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
>> (original)
>> +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java
>> Tue Mar  3 20:43:24 2009
>> @@ -132,9 +132,9 @@
>>    }
>>
>>    /**
>> -     *  @{inheritDoc}
>> +     *  {@inheritDoc}
>>     *
>> -     *  @return {@inheritDoc}
>> +     *  @return int
>>     */
>>    public int hashCode()
>>    {
>> @@ -145,7 +145,7 @@
>>     *  A WikiName is compared using it's toString() method.
>>     *
>>     *  @param o The Object to compare against.
>> -     *  @return {@inheritDoc}
>> +     *  @return int
>>     */
>>    public int compareTo( WikiName o )
>>    {
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> --- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java
>> (original)
>> +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java Tue
>> Mar  3 20:43:24 2009
>> @@ -29,7 +29,7 @@
>> /**
>>  * <p>
>>  * Generates single tabbed page layout, when nested under a
>> - * {@link TabbedSection} tag. Works together with the tabbedSection
>> javascript.
>> + * {@link TabbedSectionTag}. Works together with the tabbedSection
>> javascript.
>>  * Note that if you do not specify an url, the body contents of the tag
>> are
>>  * loaded by the tag itself.
>>  * </p>
>> @@ -131,7 +131,7 @@
>>
>>        /**
>>         * Returns the ID for this tab.
>> -         * @return
>> +         * @return id
>>         */
>>        public String getId()
>>        {
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java?rev=749739&r1=749738&r2=749739&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java
>> Tue Mar  3 20:43:24 2009
>> @@ -113,7 +113,7 @@
>>    private static final String ATTR_TABS = "JSPWiki.TabbedSection.Tags";
>>
>>    /**
>> -     * Holds the current set of related {@link TabbedSection} and {@link
>> TabTag}
>> +     * Holds the current set of related {@link TabbedSectionTag} and
>> {@link TabTag}
>>     * tags. One TabCollection is created for each HTTPServletRequest,
>> rather than
>>     * per PageContext, because the tags could span multiple pages.
>>     */
>>
>>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message