You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jspwiki.apache.org by Harry Metske <ha...@gmail.com> on 2009/10/08 19:52:10 UTC
Re: svn commit: r822981 - in /incubator/jspwiki/trunk:
src/WebContent/templates/default/ src/java/org/apache/wiki/content/jcr/
src/java/org/apache/wiki/tags/ tests/java/org/apache/wiki/auth/user/
Sorry for the incorrect Javadocs I committed the last time, must have had a
blackout .I generated and uploaded the JavaDocs again to the usual location
(http://people.apache.org/~metskem/JSPWiki/javadoc)
/Harry
2009/10/8 <aj...@apache.org>
> Author: ajaquith
> Date: Thu Oct 8 01:09:18 2009
> New Revision: 822981
>
> URL: http://svn.apache.org/viewvc?rev=822981&view=rev
> Log:
> General Javadoc and minor test tweaks.
>
> Modified:
>
> incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
>
> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
>
> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java
>
> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
>
> Modified:
> incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
> URL:
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp?rev=822981&r1=822980&r2=822981&view=diff
>
> ==============================================================================
> ---
> incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
> (original)
> +++
> incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
> Thu Oct 8 01:09:18 2009
> @@ -46,8 +46,8 @@
>
> 2) DefaultLayout injects additional JSPs that are meant to be
> customized. These include:
> -
> - commonheader.jsp : A "local header" that can contain company
> logos
> +
> + localheader.jsp : A "local header" that can contain company
> logos
> or other markup. Default=blank
>
> --%>
>
> Modified:
> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
> URL:
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java?rev=822981&r1=822980&r2=822981&view=diff
>
> ==============================================================================
> ---
> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
> (original)
> +++
> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java
> Thu Oct 8 01:09:18 2009
> @@ -115,7 +115,7 @@
> * a temporary storage for workflows.
> *
> * @param engine a reference to the {@link org.apache.wiki.WikiEngine}
> - * @param name the {@link org.apache.wiki.api.WikiPath}
> + * @param name the {@link org.apache.wiki.content.WikiPath}
> * @param node the JCR {@link javax.jcr.Node}
> * @throws RepositoryException If the page cannot be located.
> */
> @@ -229,9 +229,6 @@
> }
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public void setAttribute( String key, Date attribute )
> {
> try
> @@ -303,9 +300,6 @@
> return null;
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public void setLastModified( Date date )
> {
> setAttribute( LASTMODIFIED, date );
> @@ -553,9 +547,6 @@
> return (String)getAttribute( CONTENTTYPE );
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public List<WikiPath> getReferrers() throws ProviderException
> {
> return m_engine.getReferenceManager().getReferredBy( m_path );
> @@ -585,9 +576,6 @@
> }
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public void setContentType( String contentType )
> {
> setAttribute( CONTENTTYPE, contentType );
> @@ -664,9 +652,6 @@
> return m_path.getName();
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public boolean isLatest() throws RepositoryException
> {
> // TODO: This is a bit kludgish, but works.
> @@ -771,9 +756,6 @@
> return (JCRWikiPage)p;
> }
>
> - /**
> - * {@inheritDoc}
> - */
> public JCRWikiPage getCurrentVersion() throws ProviderException
> {
> try
>
> Modified:
> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java
> URL:
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java?rev=822981&r1=822980&r2=822981&view=diff
>
> ==============================================================================
> ---
> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java
> (original)
> +++
> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java
> Thu Oct 8 01:09:18 2009
> @@ -54,7 +54,7 @@
>
> /**
> * Returns the historical versions of the current WikiPage.
> - * @return a collection of {@link org.apache.content.WikiPage} objects
> + * @return a collection of {@link org.apache.wiki.api.WikiPage}
> objects
> */
> @Override
> protected Collection<WikiPage> initItems()
>
> Modified:
> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
> URL:
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=822981&r1=822980&r2=822981&view=diff
>
> ==============================================================================
> ---
> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
> (original)
> +++
> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
> Thu Oct 8 01:09:18 2009
> @@ -65,6 +65,7 @@
>
> protected void tearDown() throws Exception
> {
> + assertEquals( 8, m_db.getWikiNames().length );
> super.tearDown();
> m_engine.shutdown();
> }
>
>
>
Re: svn commit: r822981 - in /incubator/jspwiki/trunk: src/WebContent/templates/default/ src/java/org/apache/wiki/content/jcr/ src/java/org/apache/wiki/tags/ tests/java/org/apache/wiki/auth/user/
Posted by Andrew Jaquith <an...@gmail.com>.
Heh. No worries. Believe me, I've committed worse sins (so to speak).
On Oct 8, 2009, at 10:52, Harry Metske <ha...@gmail.com> wrote:
> Sorry for the incorrect Javadocs I committed the last time, must
> have had a
> blackout .I generated and uploaded the JavaDocs again to the usual
> location
> (http://people.apache.org/~metskem/JSPWiki/javadoc)
>
> /Harry
>
> 2009/10/8 <aj...@apache.org>
>
>> Author: ajaquith
>> Date: Thu Oct 8 01:09:18 2009
>> New Revision: 822981
>>
>> URL: http://svn.apache.org/viewvc?rev=822981&view=rev
>> Log:
>> General Javadoc and minor test tweaks.
>>
>> Modified:
>>
>> incubator/jspwiki/trunk/src/WebContent/templates/default/
>> DefaultLayout.jsp
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/
>> JCRWikiPage.java
>>
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/
>> HistoryIteratorTag.java
>>
>> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/
>> XMLUserDatabaseTest.java
>>
>> Modified:
>> incubator/jspwiki/trunk/src/WebContent/templates/default/
>> DefaultLayout.jsp
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp?rev=822981&r1=822980&r2=822981&view=diff
>>
>> ===
>> ===
>> ===
>> =====================================================================
>> ---
>> incubator/jspwiki/trunk/src/WebContent/templates/default/
>> DefaultLayout.jsp
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/WebContent/templates/default/
>> DefaultLayout.jsp
>> Thu Oct 8 01:09:18 2009
>> @@ -46,8 +46,8 @@
>>
>> 2) DefaultLayout injects additional JSPs that are meant to be
>> customized. These include:
>> -
>> - commonheader.jsp : A "local header" that can contain
>> company
>> logos
>> +
>> + localheader.jsp : A "local header" that can contain
>> company
>> logos
>> or other markup. Default=blank
>>
>> --%>
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/
>> JCRWikiPage.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/JCRWikiPage.java?rev=822981&r1=822980&r2=822981&view=diff
>>
>> ===
>> ===
>> ===
>> =====================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/
>> JCRWikiPage.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/content/jcr/
>> JCRWikiPage.java
>> Thu Oct 8 01:09:18 2009
>> @@ -115,7 +115,7 @@
>> * a temporary storage for workflows.
>> *
>> * @param engine a reference to the {@link
>> org.apache.wiki.WikiEngine}
>> - * @param name the {@link org.apache.wiki.api.WikiPath}
>> + * @param name the {@link org.apache.wiki.content.WikiPath}
>> * @param node the JCR {@link javax.jcr.Node}
>> * @throws RepositoryException If the page cannot be located.
>> */
>> @@ -229,9 +229,6 @@
>> }
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public void setAttribute( String key, Date attribute )
>> {
>> try
>> @@ -303,9 +300,6 @@
>> return null;
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public void setLastModified( Date date )
>> {
>> setAttribute( LASTMODIFIED, date );
>> @@ -553,9 +547,6 @@
>> return (String)getAttribute( CONTENTTYPE );
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public List<WikiPath> getReferrers() throws ProviderException
>> {
>> return m_engine.getReferenceManager().getReferredBy( m_path );
>> @@ -585,9 +576,6 @@
>> }
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public void setContentType( String contentType )
>> {
>> setAttribute( CONTENTTYPE, contentType );
>> @@ -664,9 +652,6 @@
>> return m_path.getName();
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public boolean isLatest() throws RepositoryException
>> {
>> // TODO: This is a bit kludgish, but works.
>> @@ -771,9 +756,6 @@
>> return (JCRWikiPage)p;
>> }
>>
>> - /**
>> - * {@inheritDoc}
>> - */
>> public JCRWikiPage getCurrentVersion() throws ProviderException
>> {
>> try
>>
>> Modified:
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/
>> HistoryIteratorTag.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java?rev=822981&r1=822980&r2=822981&view=diff
>>
>> ===
>> ===
>> ===
>> =====================================================================
>> ---
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/
>> HistoryIteratorTag.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/
>> HistoryIteratorTag.java
>> Thu Oct 8 01:09:18 2009
>> @@ -54,7 +54,7 @@
>>
>> /**
>> * Returns the historical versions of the current WikiPage.
>> - * @return a collection of {@link org.apache.content.WikiPage}
>> objects
>> + * @return a collection of {@link org.apache.wiki.api.WikiPage}
>> objects
>> */
>> @Override
>> protected Collection<WikiPage> initItems()
>>
>> Modified:
>> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/
>> XMLUserDatabaseTest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=822981&r1=822980&r2=822981&view=diff
>>
>> ===
>> ===
>> ===
>> =====================================================================
>> ---
>> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/
>> XMLUserDatabaseTest.java
>> (original)
>> +++
>> incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/
>> XMLUserDatabaseTest.java
>> Thu Oct 8 01:09:18 2009
>> @@ -65,6 +65,7 @@
>>
>> protected void tearDown() throws Exception
>> {
>> + assertEquals( 8, m_db.getWikiNames().length );
>> super.tearDown();
>> m_engine.shutdown();
>> }
>>
>>
>>