svn commit: r1054218 - in /wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples: authentication1/ authentication2/ authentication3/ authorization/ authorization/pages/ library/

Sat, 01 Jan 2011 02:24:27 -0800 

Author: mgrigorov
Date: Sat Jan  1 10:23:58 2011
New Revision: 1054218

URL: http://svn.apache.org/viewvc?rev=1054218&view=rev
Log:
WICKET-3088 Fix the build - adapt to the new package name in wicket-auth-roles.

Modified:
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInSession.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Session.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebSession.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInSession.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInSession.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInSession.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInSession.java
 Sat Jan  1 10:23:58 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.examples.authentication1;
 
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
 
 /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authentication2;
 
-import org.apache.wicket.authentication.panel.SignInPanel;
+import org.apache.wicket.authroles.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Session.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Session.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Session.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Session.java
 Sat Jan  1 10:23:58 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.examples.authentication2;
 
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
 
 /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authentication3;
 
-import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 
 
 /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
 Sat Jan  1 10:23:58 2011
@@ -17,8 +17,8 @@
 package org.apache.wicket.examples.authentication3;
 
 import org.apache.wicket.Page;
-import org.apache.wicket.authentication.AuthenticatedWebApplication;
-import org.apache.wicket.authentication.AbstractAuthenticatedWebSession;
+import 
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.markup.html.WebPage;
 
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebSession.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebSession.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebSession.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebSession.java
 Sat Jan  1 10:23:58 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.examples.authentication3;
 
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
 
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authentication3;
 
-import org.apache.wicket.authentication.panel.SignInPanel;
+import org.apache.wicket.authroles.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
 Sat Jan  1 10:23:58 2011
@@ -21,8 +21,8 @@ import java.util.List;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.Session;
-import 
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
-import 
org.apache.wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import 
org.apache.wicket.authroles.authorization.strategies.role.RoleAuthorizationStrategy;
+import 
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.examples.authorization.pages.AdminBookmarkablePage;
 import org.apache.wicket.examples.authorization.pages.AdminInternalPage;
 import org.apache.wicket.protocol.http.WebApplication;
@@ -40,8 +40,8 @@ public class RolesApplication extends We
        /**
         * User DB.
         */
-       public static List<User> USERS = Arrays.asList(
-               new User("jon", "ADMIN"), new User("kay", "USER"), new 
User("pam", ""));
+       public static List<User> USERS = Arrays.asList(new User("jon", "ADMIN"),
+               new User("kay", "USER"), new User("pam", ""));
 
        /**
         * Construct.

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
 Sat Jan  1 10:23:58 2011
@@ -17,7 +17,7 @@
 package org.apache.wicket.examples.authorization;
 
 import org.apache.wicket.IClusterable;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 
 
 /**
@@ -60,7 +60,7 @@ public class User implements IClusterabl
         */
        public boolean hasRole(String role)
        {
-               return this.roles.hasRole(role);
+               return roles.hasRole(role);
        }
 
        /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
 Sat Jan  1 10:23:58 2011
@@ -17,13 +17,14 @@
 package org.apache.wicket.examples.authorization;
 
 import org.apache.wicket.Session;
-import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import 
org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 
 
 /**
  * The authorizer we need to provide to the authorization strategy 
implementation
- * {...@link 
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy}.
+ * {...@link 
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy}
+ * .
  * 
  * @author Eelco Hillenius
  */

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authorization.pages;
 
-import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.examples.authorization.BasePage;
 
 /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authorization.pages;
 
-import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.examples.authorization.BasePage;
 
 /**

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
 Sat Jan  1 10:23:58 2011
@@ -22,8 +22,8 @@ import java.util.List;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.authorization.Action;
-import org.apache.wicket.authorization.strategies.role.Roles;
-import 
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeAction;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
+import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeAction;
 import org.apache.wicket.examples.authorization.BasePage;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.authorization.pages;
 
-import 
org.apache.wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import 
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.examples.authorization.BasePage;
 import org.apache.wicket.markup.html.panel.Panel;
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java
 Sat Jan  1 10:23:58 2011
@@ -18,8 +18,8 @@ package org.apache.wicket.examples.libra
 
 import java.util.List;
 
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
 import org.apache.wicket.request.Request;
 
 

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java?rev=1054218&r1=1054217&r2=1054218&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
 Sat Jan  1 10:23:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.examples.library;
 
-import org.apache.wicket.authentication.panel.SignInPanel;
+import org.apache.wicket.authroles.authentication.panel.SignInPanel;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;

Reply via email to