Author: almaw
Date: Sun Jun 17 22:11:50 2007
New Revision: 548216
URL: http://svn.apache.org/viewvc?view=rev&rev=548216
Log:
Move authorization
Added:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/
- copied from r548213,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.html
- copied unchanged from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/Index.html
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
- copied, changed from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/Index.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
- copied, changed from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesApplication.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
- copied, changed from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesSession.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
- copied, changed from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/User.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
- copied, changed from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/UserRolesAuthorizer.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/
- copied from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/pages/
Removed:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authentication/
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/WEB-INF/web.xml
Copied:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
(from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/Index.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java?view=diff&rev=548216&p1=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/Index.java&r1=548215&p2=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/Index.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
Sun Jun 17 22:11:50 2007
@@ -14,9 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example;
+package org.apache.wicket.examples.authorization;
import org.apache.wicket.Session;
+import
org.apache.wicket.examples.authorization.pages.AdminAnnotationsBookmarkablePage;
+import
org.apache.wicket.examples.authorization.pages.AdminAnnotationsInternalPage;
+import org.apache.wicket.examples.authorization.pages.AdminBookmarkablePage;
+import org.apache.wicket.examples.authorization.pages.AdminInternalPage;
+import org.apache.wicket.examples.authorization.pages.AnnotationsPanelsPage;
+import org.apache.wicket.examples.authorization.pages.PanelsPage;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -25,13 +31,6 @@
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminAnnotationsBookmarkablePage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminAnnotationsInternalPage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminBookmarkablePage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminInternalPage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AnnotationsPanelsPage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.PanelsPage;
/**
* Home page for the roles example.
Copied:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
(from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesApplication.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java?view=diff&rev=548216&p1=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesApplication.java&r1=548215&p2=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesApplication.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example;
+package org.apache.wicket.examples.authorization;
import java.util.Arrays;
import java.util.List;
@@ -24,9 +24,9 @@
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminBookmarkablePage;
-import
org.apache.wicket.authorization.strategies.role.example.pages.AdminInternalPage;
import
org.apache.wicket.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;
Copied:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
(from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesSession.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java?view=diff&rev=548216&p1=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesSession.java&r1=548215&p2=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/RolesSession.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example;
+package org.apache.wicket.examples.authorization;
import org.apache.wicket.Request;
import org.apache.wicket.protocol.http.WebApplication;
Copied:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
(from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/User.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java?view=diff&rev=548216&p1=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/User.java&r1=548215&p2=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/User.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example;
+package org.apache.wicket.examples.authorization;
import org.apache.wicket.IClusterable;
import org.apache.wicket.authorization.strategies.role.Roles;
Copied:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
(from r548215,
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/UserRolesAuthorizer.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java?view=diff&rev=548216&p1=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/UserRolesAuthorizer.java&r1=548215&p2=incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/authorization/strategies/role/example/UserRolesAuthorizer.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/UserRolesAuthorizer.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example;
+package org.apache.wicket.examples.authorization;
import org.apache.wicket.Session;
import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.WebPage;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.WebPage;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import org.apache.wicket.markup.html.WebPage;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import org.apache.wicket.markup.html.WebPage;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import java.util.Arrays;
import java.util.List;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.java
Sun Jun 17 22:11:50 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.authorization.strategies.role.example.pages;
+package org.apache.wicket.examples.authorization.pages;
import
org.apache.wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebPage;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/WEB-INF/web.xml?view=diff&rev=548216&r1=548215&r2=548216
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/webapp/WEB-INF/web.xml
Sun Jun 17 22:11:50 2007
@@ -339,7 +339,7 @@
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
-
<param-value>org.apache.wicket.authorization.strategies.role.example.RolesApplication</param-value>
+
<param-value>org.apache.wicket.examples.authorization.RolesApplication</param-value>
</init-param>
</filter>
