jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r667702 - in /incubator/jspwiki/trunk: ./ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/auth/login/ src/com/ecyrd/jspwiki/auth/user/ src/com/ecyrd/jspwiki/parser/ src/com/ecyrd/jspwiki/plugin/ src/com/ecyrd/jspwiki/providers/ src/com/ecyrd/j...
Date Sat, 14 Jun 2008 00:24:33 GMT
Author: ajaquith
Date: Fri Jun 13 17:24:33 2008
New Revision: 667702

URL: http://svn.apache.org/viewvc?rev=667702&view=rev
Log:
Small comment and Javadoc tweaks. Removed outdated Selenium jars.

Modified:
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/HttpRequestCallback.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/MarkupParser.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/GroupCommand.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/PageCommand.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/RedirectCommand.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiCommand.java

Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Fri Jun 13 17:24:33 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="webdocs/|wikipages/|images/" kind="src" output="build" path="src"/>
-	<classpathentry excluding="etc/|build/|reports/" kind="src" output="tests/build" path="tests"/>
+	<classpathentry excluding="etc/|build/|reports/|lib/" kind="src" output="tests/build"
path="tests"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-api.jar"/>
 	<classpathentry kind="lib" path="lib/ecs.jar"/>

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/VariableManager.java Fri Jun 13 17:24:33
2008
@@ -452,6 +452,7 @@
             return res.toString();
         }
 
+        @SuppressWarnings("deprecation")
         public String getPluginpath()
         {
             String s = m_context.getEngine().getPluginSearchPath();

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/HttpRequestCallback.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/HttpRequestCallback.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/HttpRequestCallback.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/HttpRequestCallback.java Fri
Jun 13 17:24:33 2008
@@ -27,8 +27,8 @@
  * Callback for requesting and supplying a HttpServletRequest required by a
  * LoginModule. This Callback is used by LoginModules needing access to the
  * servlet request.
- * @link javax.servlet.http.HttpServletRequest#getUserPrincipal() or
- * @link javax.servlet.http.HttpServletRequest#getRemoteUser() methods.
+ * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() or
+ * @see javax.servlet.http.HttpServletRequest#getRemoteUser() methods.
  * @author Andrew Jaquith
  * @since 2.3
  */

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/WebContainerCallbackHandler.java
Fri Jun 13 17:24:33 2008
@@ -32,7 +32,7 @@
 
 /**
  * Handles logins made from within JSPWiki.
- * @link AuthenticationManager#getWikiSession(HttpServletRequest).
+ * @see AuthenticationManager#getWikiSession(HttpServletRequest)
  * @author Andrew Jaquith
  * @since 2.3
  */

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Fri Jun 13
17:24:33 2008
@@ -524,6 +524,13 @@
                 break;
             }
         }
+        
+        // If user not found, somebody's been deleting/modifying users behind our back
+        if ( user == null )
+        {
+            throw new IllegalStateException( "UserDatabase did not contain user with loginName="
+ profile.getLoginName() + "!" );
+        }
+        
         Date modDate = new Date( System.currentTimeMillis() );
         if ( isNew )
         {

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/MarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/MarkupParser.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/MarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/MarkupParser.java Fri Jun 13 17:24:33
2008
@@ -234,8 +234,8 @@
      *  Push back any character to the current input.  Does not
      *  push back a read EOF, though.
      *  
-     *  @throws IOException In case the character cannot be pushed back.
      *  @param c Character to push back.
+     *  @throws IOException In case the character cannot be pushed back.
      */
     protected void pushBack( int c )
         throws IOException

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Fri Jun
13 17:24:33 2008
@@ -106,9 +106,10 @@
     protected           WikiEngine m_engine;
 
     /**
-     *  {@inheritDoc}
+     * @param context the wiki context
+     * @param params parameters for initializing the plugin
+     * @throws PluginException if any of the plugin parameters are malformed
      */
-
     // FIXME: The compiled pattern strings should really be cached somehow.
     public void initialize( WikiContext context, Map params )
         throws PluginException

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java Fri Jun 13
17:24:33 2008
@@ -672,7 +672,7 @@
      *  util method to parse a date string in Local and UTC formats.  This method is synchronized
      *  because SimpleDateFormat is not thread-safe.
      *
-     *  @see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4228335
+     *  @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4228335">Sun
bug 4228335</a>
      */
     private synchronized Date parseDate( String str )
     {

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/GroupCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/GroupCommand.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/GroupCommand.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/GroupCommand.java Fri Jun 13 17:24:33
2008
@@ -62,7 +62,7 @@
      * @param target the target of this command (a GroupPrincipal representing a Group);
may be <code>null</code>
      * @param action the action used to construct a suitable GroupPermission
      * @param contentTemplate the content template; may be <code>null</code>
-     * @return IllegalArgumentException if the request content, URL pattern, or
+     * @throws IllegalArgumentException if the request content, URL pattern, or
      *         type is <code>null</code>
      */
     private GroupCommand( String requestContext, String urlPattern, String contentTemplate,
GroupPrincipal target, String action )

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java Fri Jun 13 17:24:33 2008
@@ -185,6 +185,7 @@
         return m_props.getProperty( key );
     }
     
+    @SuppressWarnings("deprecation")
     public void parseProperties () throws Exception
     {
         ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/PageCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/PageCommand.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/PageCommand.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/PageCommand.java Fri Jun 13 17:24:33
2008
@@ -92,7 +92,7 @@
      * @param target the target of the command (a WikiPage); may be <code>null</code>
      * @param action the action used to construct a suitable PagePermission
      * @param contentTemplate the content template; may be <code>null</code>
-     * @return IllegalArgumentException if the request content, URL pattern, or
+     * @throws IllegalArgumentException if the request content, URL pattern, or
      *         type is <code>null</code>
      */
     private PageCommand( String requestContext, String urlPattern, String contentTemplate,
WikiPage target, String action )

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/RedirectCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/RedirectCommand.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/RedirectCommand.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/RedirectCommand.java Fri Jun 13 17:24:33
2008
@@ -49,7 +49,7 @@
      * @param urlPattern the URL pattern
      * @param contentTemplate the content template; may be <code>null</code>
      * @param target the target of the command
-     * @return IllegalArgumentException if the request content, URL pattern, or
+     * @throws IllegalArgumentException if the request content, URL pattern, or
      *         type is <code>null</code>
      */
     private RedirectCommand( String requestContext, String urlPattern, String contentTemplate,
String target )

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiCommand.java?rev=667702&r1=667701&r2=667702&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiCommand.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiCommand.java Fri Jun 13 17:24:33
2008
@@ -32,7 +32,7 @@
  * targeted Commands.</p>
  * <p>This class is not <code>final</code>; it may be extended in
  * the future.</p>
- * @see com.ecyrd.jspwiki.WikiEngine#getApplicationName().
+ * @see com.ecyrd.jspwiki.WikiEngine#getApplicationName()
  * @author Andrew Jaquith
  * @since 2.4.22
  */
@@ -82,7 +82,7 @@
      * @param type the type
      * @param contentTemplate the content template; may be <code>null</code>
      * @param action The action
-     * @return IllegalArgumentException if the request content, URL pattern, or
+     * @throws IllegalArgumentException if the request content, URL pattern, or
      *         type is <code>null</code>
      */
     private WikiCommand( String requestContext, 



Mime
View raw message