Hi Peter, Everyone,
On Fri, Feb 15, 2008 at 9:12 PM, Peter Neubauer <[EMAIL PROTECTED]>
wrote:
> Welcome Kamil to OPS4J!
>
> /peter
>
> On Fri, Feb 15, 2008 at 10:51 AM, <[EMAIL PROTECTED]> wrote:
> > Author: muhdkamil
> > Date: Fri Feb 15 10:51:51 2008
> > New Revision: 10568
> >
> > Log:
> > Update PaxWicketSession constructor and testcases. Comment out
> getServletPath and deprecated getRelativeURL method
> >
> > Modified:
> >
>
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxAuthenticatedWicketApplication.java
> >
>
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketRequest.java
> >
>
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketSession.java
> > projects/pax/wicket/service/src/main/resources/wicket.properties
> >
>
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketRequestTestCase.java
> >
>
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketSessionTestCase.java
> >
> > Modified:
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxAuthenticatedWicketApplication.java
> >
>
> ==============================================================================
> > ---
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxAuthenticatedWicketApplication.java
> (original)
> > +++
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxAuthenticatedWicketApplication.java
> Fri Feb 15 10:51:51 2008
> > @@ -24,6 +24,9 @@
> > import java.util.Properties;
> > import javax.servlet.http.HttpServletRequest;
> > import org.apache.wicket.Page;
> > +import org.apache.wicket.Request;
> > +import org.apache.wicket.Response;
> > +import org.apache.wicket.Session;
> > import org.apache.wicket.authentication.AuthenticatedWebApplication;
> > import org.apache.wicket.authentication.AuthenticatedWebSession;
> > import org.apache.wicket.authorization.strategies.role.Roles;
> > @@ -164,12 +167,17 @@
> > * @return AuthenticatedWebSession subclass to use in this
> authenticated web application.
> > */
> > @Override
> > - protected Class<? extends AuthenticatedWebSession>
> getWebSessionClass()
> > + protected final Class<? extends AuthenticatedWebSession>
> getWebSessionClass()
> > {
> > return PaxWicketSession.class;
> > }
> > +
> > + @Override
> > + public final Session newSession(Request request, Response
> response) {
> > + return new PaxWicketSession(this, request);
> > + }
> >
> > - /**
> > + /**
> > * @return Subclass of sign-in page
> > */
> > @Override
> >
> > Modified:
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketRequest.java
> >
>
> ==============================================================================
> > ---
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketRequest.java
> (original)
> > +++
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketRequest.java
> Fri Feb 15 10:51:51 2008
> > @@ -19,6 +19,7 @@
> > package org.ops4j.pax.wicket.internal;
> >
> > import javax.servlet.http.HttpServletRequest;
> > +
> > import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
> > import org.ops4j.lang.NullArgumentException;
> > import org.slf4j.Logger;
> > @@ -65,7 +66,7 @@
> > *
> > * @return Servlet path
> > */
> > - @Override
> > + /[EMAIL PROTECTED]
> > public final String getServletPath()
> > {
> > String contextPath = getHttpServletRequest().getContextPath();
> > @@ -79,7 +80,7 @@
> > }
> >
> > return contextPath;
> > - }
> > + }*/
> >
> > // /**
> > // * Gets the servlet context path.
> > @@ -116,7 +117,7 @@
> > // return servletPath;
> > // }
> >
> > - @Override
> > + /[EMAIL PROTECTED]
> > public String getRelativeURL()
> > {
> > String url = getServletPath();
> > @@ -145,6 +146,7 @@
> > url = url.substring( 1 );
> > }
> >
> > + if(LOGGER.isDebugEnabled()) LOGGER.debug("URL=" + url);
> > return url;
> > - }
> > + }*/
> > }
> >
> > Modified:
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketSession.java
> >
>
> ==============================================================================
> > ---
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketSession.java
> (original)
> > +++
> projects/pax/wicket/service/src/main/java/org/ops4j/pax/wicket/internal/PaxWicketSession.java
> Fri Feb 15 10:51:51 2008
> > @@ -18,7 +18,9 @@
> > package org.ops4j.pax.wicket.internal;
> >
> > import java.io.Serializable;
> > +
> > import org.apache.wicket.Request;
> > +import org.apache.wicket.authentication.AuthenticatedWebApplication;
> > import org.apache.wicket.authentication.AuthenticatedWebSession;
> > import org.apache.wicket.authorization.strategies.role.Roles;
> > import org.ops4j.pax.wicket.api.PaxWicketAuthentication;
> > @@ -37,11 +39,9 @@
> > *
> > * @param request The incoming request.
> > */
> > - public PaxWicketSession( Request request )
> > + public PaxWicketSession( AuthenticatedWebApplication application,
> Request request )
> > {
> > - // Note that currently the Application constructor argument in
> the Session classes are
> > - // not used at all. This could change in the future.
> > - super( null, request );
> > + super( application, request );
> > }
> >
> > /**
> >
> > Modified:
> projects/pax/wicket/service/src/main/resources/wicket.properties
> >
>
> ==============================================================================
> > --- projects/pax/wicket/service/src/main/resources/wicket.properties
> (original)
> > +++ projects/pax/wicket/service/src/main/resources/wicket.properties
> Fri Feb 15 10:51:51 2008
> > @@ -1,2 +1,2 @@
> > initializer=org.ops4j.pax.wicket.internal.Initializer
> > -wicket.version=1.2.6
> > \ No newline at end of file
> > +wicket.version=1.3.1
> > \ No newline at end of file
> >
> > Modified:
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketRequestTestCase.java
> >
>
> ==============================================================================
> > ---
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketRequestTestCase.java
> (original)
> > +++
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketRequestTestCase.java
> Fri Feb 15 10:51:51 2008
> > @@ -106,7 +106,7 @@
> > }
> > */
> >
> > - public final void testGetServletPath()
> > + /*public final void testGetServletPath()
> > {
> > String mntPoint = "/mntPoint";
> > HttpServletRequest request = mock( HttpServletRequest.class );
> > @@ -128,5 +128,5 @@
> > checking( exp2 );
> > String retServletPath2 = paxWicketRequest.getServletPath();
> > assertEquals( expMountPoint, retServletPath2 );
> > - }
> > + }*/
> > }
> >
> > Modified:
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketSessionTestCase.java
> >
>
> ==============================================================================
> > ---
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketSessionTestCase.java
> (original)
> > +++
> projects/pax/wicket/service/src/test/java/org/ops4j/pax/wicket/internal/PaxWicketSessionTestCase.java
> Fri Feb 15 10:51:51 2008
> > @@ -17,24 +17,23 @@
> > */
> > package org.ops4j.pax.wicket.internal;
> >
> > -import java.lang.reflect.Method;
> > -import org.jmock.Expectations;
> > -import org.jmock.integration.junit3.MockObjectTestCase;
> > -import org.ops4j.pax.wicket.api.PaxWicketAuthenticator;
> > -import org.osgi.framework.BundleContext;
> > import static org.apache.wicket.Application.set;
> > +
> > +import javax.servlet.http.HttpServletRequest;
> > +
> > import org.apache.wicket.Page;
> > import org.apache.wicket.Request;
> > -import org.apache.wicket.util.tester.WicketTester;
> > import org.apache.wicket.authorization.strategies.role.Roles;
> > import org.apache.wicket.markup.html.WebPage;
> > -import org.apache.wicket.protocol.http.WebApplication;
> > -import org.apache.wicket.protocol.http.WicketFilter;
> > import org.apache.wicket.protocol.http.IWebApplicationFactory;
> > -import org.apache.wicket.protocol.http.MockServletContext;
> > import org.apache.wicket.protocol.http.MockHttpServletRequest;
> > -import javax.servlet.ServletContext;
> > -import javax.servlet.http.HttpServletRequest;
> > +import org.apache.wicket.protocol.http.WebApplication;
> > +import org.apache.wicket.protocol.http.WicketFilter;
> > +import org.apache.wicket.util.tester.WicketTester;
> > +import org.jmock.Expectations;
> > +import org.jmock.integration.junit3.MockObjectTestCase;
> > +import org.ops4j.pax.wicket.api.PaxWicketAuthenticator;
> > +import org.osgi.framework.BundleContext;
> >
> > public class PaxWicketSessionTestCase extends MockObjectTestCase
> > {
> > @@ -71,7 +70,8 @@
> >
> > HttpServletRequest httpRequest = new MockHttpServletRequest(
> application, null, null );
> > Request request = new PaxWicketRequest( "/mock-point",
> httpRequest );
> > - PaxWicketSession session = new PaxWicketSession( request );
> > + PaxWicketSession session = new PaxWicketSession( application,
> request );
> > + //PaxWicketSession session = new PaxWicketSession( request );
> >
> > // Test unsuccesfull authentication
> > Expectations exp1 = new Expectations();
> >
> > _______________________________________________
> > notify mailing list
> > [EMAIL PROTECTED]
> > http://lists.ops4j.org/mailman/listinfo/notify
> >
> >
>
>
>
> --
> GTalk: neubauer.peter
> Skype peter.neubauer
> ICQ 18762544
> GTalk neubauer.peter
> Phone +46704 106975
> Mail [EMAIL PROTECTED]
> LinkedIn http://www.linkedin.com/in/neubauer
>
> http://www.neo4j.org - New Energy for Data - the Netbase.
> http://www.ops4j.org - New Energy for OSS Communities - Open
> Participation Software.
> http://www.qi4j.org - New Energy for Java - Domain Driven Development.
>
> _______________________________________________
> general mailing list
> general@lists.ops4j.org
> http://lists.ops4j.org/mailman/listinfo/general
>
_______________________________________________
general mailing list
general@lists.ops4j.org
http://lists.ops4j.org/mailman/listinfo/general
