incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Jaquith <andrew.jaqu...@me.com>
Subject Re: svn commit: r721920 - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki: ./ action/ url/
Date Mon, 01 Dec 2008 00:54:04 GMT
Possibly tonight but doughtful (in transit); otherwise, tomorrow night.

On Nov 30, 2008, at 18:19, Janne Jalkanen <Janne.Jalkanen@ecyrd.com>  
wrote:

>
> Considering that the trunk is getting new stuff all the time and you  
> will probably soon spend more time integrating rather than  
> developing new stuff, is there any chance you could merge the  
> stripes branch to the trunk soon?
>
> /Janne
>
> On Dec 1, 2008, at 00:49 , ajaquith@apache.org wrote:
>
>> Author: ajaquith
>> Date: Sun Nov 30 14:49:53 2008
>> New Revision: 721920
>>
>> URL: http://svn.apache.org/viewvc?rev=721920&view=rev
>> Log:
>> Merged STRIPES_BRANCH with trunk revision 721863 (fixed compilation  
>> errors).
>>
>> Modified:
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/WikiContext.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/DefaultWikiContext.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/LoginActionBean.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/RenameActionBean.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/UserProfileActionBean.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/ViewActionBean.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiContextFactory.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiInterceptor.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiRuntimeConfiguration.java
>>    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/url/StripesURLConstructor.java
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/WikiContext.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/WikiContext.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/WikiContext.java Sun Nov 30 14:49:53 2008
>> @@ -25,15 +25,6 @@
>> import java.util.ResourceBundle;
>>
>> import javax.servlet.http.HttpServletRequest;
>> -<<<<<<< .working
>> -=======
>> -import javax.servlet.http.HttpServletResponse;
>> -import javax.servlet.http.HttpSession;
>> -import javax.servlet.jsp.PageContext;
>> -
>> -import com.ecyrd.jspwiki.log.Logger;
>> -import com.ecyrd.jspwiki.log.LoggerFactory;
>> ->>>>>>> .merge-right.r721865
>>
>> import com.ecyrd.jspwiki.action.*;
>>
>> @@ -145,134 +136,8 @@
>>     public static final String    OTHER    = "other";
>>
>>     /** User is doing administrative things. */
>> -<<<<<<< .working
>>     public static final String    ADMIN    = "admin";
>>
>> -=======
>> -    public static final String    ADMIN    =  
>> WikiCommand.ADMIN.getRequestContext();
>> -
>> -    private static final Logger   log      =  
>> LoggerFactory.getLogger( WikiContext.class );
>> -
>> -    private static final Permission DUMMY_PERMISSION  = new  
>> java.util.PropertyPermission( "os.name", "read" );
>> -
>> -    /**
>> -     *  Create a new WikiContext for the given WikiPage. Delegates  
>> to
>> -     * {@link #WikiContext(WikiEngine, HttpServletRequest,  
>> WikiPage)}.
>> -     *  @param engine The WikiEngine that is handling the request.
>> -     *  @param page   The WikiPage.  If you want to create a
>> -     *  WikiContext for an older version of a page, you must use  
>> this
>> -     *  constructor.
>> -     */
>> -    public WikiContext( WikiEngine engine, WikiPage page )
>> -    {
>> -        this( engine, null, findCommand( engine, null, page ) );
>> -    }
>> -
>> -    /**
>> -     * <p>
>> -     * Creates a new WikiContext for the given WikiEngine, Command  
>> and
>> -     * HttpServletRequest.
>> -     * </p>
>> -     * <p>
>> -     * This constructor will also look up the HttpSession  
>> associated with the
>> -     * request, and determine if a WikiSession object is present.  
>> If not, a new
>> -     * one is created.
>> -     * </p>
>> -     * @param engine The WikiEngine that is handling the request
>> -     * @param request The HttpServletRequest that should be  
>> associated with this
>> -     *            context. This parameter may be <code>null</code>.
>> -     * @param command the command
>> -     * @throws IllegalArgumentException if <code>engine</code> or
>> -     *             <code>command</code> are <code>null</code>
>> -     */
>> -    public WikiContext( WikiEngine engine, HttpServletRequest  
>> request, Command command )
>> -        throws IllegalArgumentException
>> -    {
>> -        super();
>> -        if ( engine == null || command == null )
>> -        {
>> -            throw new IllegalArgumentException( "Parameter engine  
>> and command must not be null." );
>> -        }
>> -
>> -        m_engine = engine;
>> -        m_request = request;
>> -        m_session = WikiSession.getWikiSession( engine, request );
>> -        m_command = command;
>> -
>> -        // If PageCommand, get the WikiPage
>> -        if( command instanceof PageCommand )
>> -        {
>> -            m_page = (WikiPage)((PageCommand)command).getTarget();
>> -        }
>> -
>> -        // If page not supplied, default to front page to avoid NPEs
>> -        if( m_page == null )
>> -        {
>> -            m_page = m_engine.getPage( m_engine.getFrontPage() );
>> -
>> -            // Front page does not exist?
>> -            if( m_page == null )
>> -            {
>> -                m_page = new WikiPage( m_engine,  
>> m_engine.getFrontPage() );
>> -            }
>> -        }
>> -
>> -        m_realPage = m_page;
>> -
>> -        // Special case: retarget any empty 'view' PageCommands to  
>> the front page
>> -        if ( PageCommand.VIEW.equals( command ) &&  
>> command.getTarget() == null )
>> -        {
>> -            m_command = command.targetedCommand( m_page );
>> -        }
>> -
>> -        // Debugging...
>> -        if( log.isDebugEnabled() )
>> -        {
>> -            HttpSession session = ( request == null ) ? null :  
>> request.getSession( false );
>> -            String sid = ( session == null ) ? "(null)" :  
>> session.getId();
>> -            log.debug( "Creating WikiContext for session ID=" +  
>> sid + "; target=" + getName() );
>> -        }
>> -
>> -        // Figure out what template to use
>> -        setDefaultTemplate( request );
>> -    }
>> -
>> -    /**
>> -     * Creates a new WikiContext for the given WikiEngine,  
>> WikiPage and
>> -     * HttpServletRequest. This method simply looks up the  
>> appropriate Command
>> -     * using {@link #findCommand(WikiEngine, HttpServletRequest,  
>> WikiPage)} and
>> -     * delegates to
>> -     * {@link #WikiContext(WikiEngine, HttpServletRequest,  
>> Command)}.
>> -     * @param engine The WikiEngine that is handling the request
>> -     * @param request The HttpServletRequest that should be  
>> associated with this
>> -     *            context. This parameter may be <code>null</code>.
>> -     * @param page The WikiPage. If you want to create a  
>> WikiContext for an
>> -     *            older version of a page, you must supply this  
>> parameter
>> -     */
>> -    public WikiContext(WikiEngine engine, HttpServletRequest  
>> request, WikiPage page)
>> -    {
>> -        this( engine, request, findCommand( engine, request,  
>> page ) );
>> -    }
>> -
>> -    /**
>> -     * {@inheritDoc}
>> -     * @see com.ecyrd.jspwiki.ui.Command#getContentTemplate()
>> -     */
>> -    public String getContentTemplate()
>> -    {
>> -        return m_command.getContentTemplate();
>> -    }
>> -
>> -    /**
>> -     * {@inheritDoc}
>> -     * @see com.ecyrd.jspwiki.ui.Command#getJSP()
>> -     */
>> -    public String getJSP()
>> -    {
>> -        return m_command.getContentTemplate();
>> -    }
>> -
>> ->>>>>>> .merge-right.r721865
>>     /**
>>      *  Sets a reference to the real page whose content is  
>> currently being
>>      *  rendered.
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/DefaultWikiContext.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/DefaultWikiContext.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/DefaultWikiContext.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/DefaultWikiContext.java Sun Nov 30 14:49:53 2008
>> @@ -28,14 +28,14 @@
>>
>> import javax.servlet.http.HttpServletRequest;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiContext;
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiPage;
>> import com.ecyrd.jspwiki.WikiSession;
>> import com.ecyrd.jspwiki.auth.WikiPrincipal;
>> import com.ecyrd.jspwiki.auth.permissions.AllPermission;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>> import com.ecyrd.jspwiki.preferences.Preferences;
>>
>> /**
>> @@ -48,7 +48,7 @@
>>  */
>> public class DefaultWikiContext implements WikiContext
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( DefaultWikiContext.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( DefaultWikiContext.class );
>>
>>     private WikiPage m_page;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/LoginActionBean.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/LoginActionBean.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/LoginActionBean.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/LoginActionBean.java Sun Nov 30 14:49:53 2008
>> @@ -13,19 +13,19 @@
>> import net.sourceforge.stripes.validation.Validate;
>> import net.sourceforge.stripes.validation.ValidationErrors;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiSession;
>> import com.ecyrd.jspwiki.auth.WikiSecurityException;
>> import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule;
>> import com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule;
>> import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> @UrlBinding( "/Login.action" )
>> public class LoginActionBean extends AbstractActionBean
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( LoginActionBean.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( LoginActionBean.class );
>>
>>     /**
>>      * Sets cookies and redirects the user to a wiki page after a  
>> successful
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/RenameActionBean.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/RenameActionBean.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/RenameActionBean.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/RenameActionBean.java Sun Nov 30 14:49:53 2008
>> @@ -11,12 +11,12 @@
>> import net.sourceforge.stripes.validation.ValidationErrors;
>> import net.sourceforge.stripes.validation.ValidationMethod;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiException;
>> import com.ecyrd.jspwiki.WikiPage;
>> import com.ecyrd.jspwiki.auth.permissions.PagePermission;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * <p>
>> @@ -51,7 +51,7 @@
>> @UrlBinding( "/Rename.action" )
>> public class RenameActionBean extends AbstractActionBean
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( RenameActionBean.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( RenameActionBean.class );
>>
>>     private boolean m_changeReferences = false;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/UserProfileActionBean.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/UserProfileActionBean.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/UserProfileActionBean.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/UserProfileActionBean.java Sun Nov 30 14:49:53  
>> 2008
>> @@ -7,8 +7,6 @@
>> import net.sourceforge.stripes.util.UrlBuilder;
>> import net.sourceforge.stripes.validation.*;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiSession;
>> import com.ecyrd.jspwiki.auth.AuthenticationManager;
>> @@ -18,6 +16,8 @@
>> import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
>> import com.ecyrd.jspwiki.auth.user.UserDatabase;
>> import com.ecyrd.jspwiki.auth.user.UserProfile;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>> import com.ecyrd.jspwiki.workflow.DecisionRequiredException;
>>
>> /**
>> @@ -26,7 +26,7 @@
>> @UrlBinding( "/UserProfile.action" )
>> public class UserProfileActionBean extends AbstractActionBean
>> {
>> -    Logger log = Logger.getLogger( UserProfileActionBean.class );
>> +    Logger log =  
>> LoggerFactory.getLogger( UserProfileActionBean.class );
>>
>>     private String m_redirect = null;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/ViewActionBean.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/ViewActionBean.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/ViewActionBean.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/ViewActionBean.java Sun Nov 30 14:49:53 2008
>> @@ -6,12 +6,12 @@
>> import net.sourceforge.stripes.validation.ValidationError;
>> import net.sourceforge.stripes.validation.ValidationErrors;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiException;
>> import com.ecyrd.jspwiki.WikiPage;
>> import com.ecyrd.jspwiki.auth.permissions.PagePermission;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * Displays the wiki page a users requested, resolving special page  
>> names and
>> @@ -22,7 +22,7 @@
>> @UrlBinding("/Wiki.action")
>> public class ViewActionBean extends AbstractActionBean
>> {
>> -    private Logger log = Logger.getLogger(ViewActionBean.class);
>> +    private Logger log =  
>> LoggerFactory.getLogger(ViewActionBean.class);
>>
>>     private WikiPage m_page = null;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/WikiContextFactory.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/WikiContextFactory.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiContextFactory.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiContextFactory.java Sun Nov 30 14:49:53 2008
>> @@ -13,10 +13,10 @@
>> import net.sourceforge.stripes.mock.MockHttpSession;
>> import net.sourceforge.stripes.util.ResolverUtil;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.*;
>> import com.ecyrd.jspwiki.auth.SessionMonitor;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>> import com.ecyrd.jspwiki.parser.MarkupParser;
>> import com.ecyrd.jspwiki.preferences.Preferences;
>> import com.ecyrd.jspwiki.providers.ProviderException;
>> @@ -58,7 +58,7 @@
>>      */
>>     public static final String PROPS_ACTIONBEAN_PACKAGES =  
>> "jspwiki.actionBean.packages";
>>
>> -    private static final Logger log =  
>> Logger.getLogger( WikiContextFactory.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( WikiContextFactory.class );
>>
>>     private static final long serialVersionUID = 1L;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/WikiInterceptor.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/WikiInterceptor.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiInterceptor.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiInterceptor.java Sun Nov 30 14:49:53 2008
>> @@ -12,13 +12,13 @@
>> import net.sourceforge.stripes.action.Resolution;
>> import net.sourceforge.stripes.controller.*;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiContext;
>> import com.ecyrd.jspwiki.WikiEngine;
>> import com.ecyrd.jspwiki.WikiSession;
>> import com.ecyrd.jspwiki.auth.AuthorizationManager;
>> import com.ecyrd.jspwiki.auth.SessionMonitor;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * <p>
>> @@ -68,7 +68,7 @@
>> @Intercepts( { LifecycleStage.ActionBeanResolution,  
>> LifecycleStage.BindingAndValidation } )
>> public class WikiInterceptor implements Interceptor
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( WikiInterceptor.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( WikiInterceptor.class );
>>     /**
>>      * The PageContext attribute name of the WikiActionBean stored by
>>      * WikiInterceptor.
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/action/WikiRuntimeConfiguration.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/WikiRuntimeConfiguration.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiRuntimeConfiguration.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/action/WikiRuntimeConfiguration.java Sun Nov 30  
>> 14:49:53 2008
>> @@ -4,9 +4,9 @@
>>
>> import net.sourceforge.stripes.config.RuntimeConfiguration;
>>
>> -import org.apache.log4j.Logger;
>> -
>> import com.ecyrd.jspwiki.WikiEngine;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * Subclass of Stripes
>> @@ -20,7 +20,7 @@
>>  */
>> public class WikiRuntimeConfiguration extends RuntimeConfiguration
>> {
>> -    private Logger log =  
>> Logger.getLogger(WikiRuntimeConfiguration.class);
>> +    private Logger log =  
>> LoggerFactory.getLogger(WikiRuntimeConfiguration.class);
>>
>>     private WikiEngine m_engine = null;
>>
>>
>> Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/ 
>> com/ecyrd/jspwiki/url/StripesURLConstructor.java
>> URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/StripesURLConstructor.java?rev=721920&r1=721919&r2=721920&view=diff
>> === 
>> === 
>> === 
>> =====================================================================
>> --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/url/StripesURLConstructor.java (original)
>> +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ 
>> ecyrd/jspwiki/url/StripesURLConstructor.java Sun Nov 30 14:49:53 2008
>> @@ -35,11 +35,15 @@
>> import net.sourceforge.stripes.util.bean.ParseException;
>>
>> import org.apache.commons.lang.StringUtils;
>> -import org.apache.log4j.Logger;
>>
>> import com.ecyrd.jspwiki.WikiContext;
>> import com.ecyrd.jspwiki.WikiEngine;
>> -import com.ecyrd.jspwiki.action.*;
>> +import com.ecyrd.jspwiki.action.AttachActionBean;
>> +import com.ecyrd.jspwiki.action.GroupActionBean;
>> +import com.ecyrd.jspwiki.action.HandlerInfo;
>> +import com.ecyrd.jspwiki.action.WikiActionBean;
>> +import com.ecyrd.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * Implements the default URL constructor using links directly to  
>> the JSP pages.
>> @@ -50,7 +54,7 @@
>>  */
>> public class StripesURLConstructor extends DefaultURLConstructor
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( StripesURLConstructor.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( StripesURLConstructor.class );
>>
>>     /**
>>      * Contains the absolute path of the JSPWiki Web application  
>> without the
>>
>
> d.jspwiki.log.Logger;
>> +import com.ecyrd.jspwiki.log.LoggerFactory;
>>
>> /**
>>  * Implements the default URL constructor using links directly to  
>> the JSP pages.
>> @@ -50,7 +54,7 @@
>>  */
>> public class StripesURLConstructor extends DefaultURLConstructor
>> {
>> -    private static final Logger log =  
>> Logger.getLogger( StripesURLConstructor.class );
>> +    private static final Logger log =  
>> LoggerFactory.getLogger( StripesURLConstructor.class );
>>
>>     /**
>>      * Contains the absolute path of the JSPWiki Web application  
>> without the
>>
>

Mime
View raw message