Author: jcompagner
Date: Tue Apr 10 09:06:10 2007
New Revision: 527174
URL: http://svn.apache.org/viewvc?view=rev&rev=527174
Log:
org.apache.wicket rename
Added:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebApplication.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/pages/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/panel/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
- copied, changed from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/Roles.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/annotations/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/metadata/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/metadata/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/
- copied from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/util/license/
Removed:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/metadata/
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/wicket/util/
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/log4j.properties
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebApplication.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebApplication.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebApplication.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
Tue Apr 10 09:06:10 2007
@@ -14,22 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authentication;
+package org.apache.wicket.authentication;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.Request;
+import org.apache.wicket.Response;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.Session;
+import org.apache.wicket.WicketRuntimeException;
+import
org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
+import org.apache.wicket.authorization.UnauthorizedInstantiationException;
+import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
+import
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
+import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.protocol.http.WebApplication;
-import wicket.Component;
-import wicket.Page;
-import wicket.Request;
-import wicket.Response;
-import wicket.RestartResponseAtInterceptPageException;
-import wicket.Session;
-import wicket.WicketRuntimeException;
-import wicket.authorization.IUnauthorizedComponentInstantiationListener;
-import wicket.authorization.UnauthorizedInstantiationException;
-import wicket.authorization.strategies.role.IRoleCheckingStrategy;
-import wicket.authorization.strategies.role.RoleAuthorizationStrategy;
-import wicket.authorization.strategies.role.Roles;
-import wicket.markup.html.WebPage;
-import wicket.protocol.http.WebApplication;
/**
* A web application subclass that does role-based authentication.
@@ -90,7 +91,7 @@
}
/**
- * @see wicket.protocol.http.WebApplication#newSession(wicket.Request,
wicket.Response)
+ * @see
org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket.Request,
org.apache.wicket.Response)
*/
@Override
public Session newSession(final Request request, final Response
response) {
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authentication/AuthenticatedWebSession.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
Tue Apr 10 09:06:10 2007
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authentication;
+package org.apache.wicket.authentication;
+
+import org.apache.wicket.Request;
+import org.apache.wicket.Session;
+import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.protocol.http.WebSession;
-import wicket.Request;
-import wicket.Session;
-import wicket.authorization.strategies.role.Roles;
-import wicket.protocol.http.WebSession;
/**
* Basic authenticated web session. Subclasses must provide a method that
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
Tue Apr 10 09:06:10 2007
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authentication.pages;
+package org.apache.wicket.authentication.pages;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.authentication.panel.SignInPanel;
+import org.apache.wicket.markup.html.WebPage;
-import wicket.PageParameters;
-import wicket.authentication.panel.SignInPanel;
-import wicket.markup.html.WebPage;
/**
* A base class which provide standard functionality for sign in.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
Tue Apr 10 09:06:10 2007
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authentication.pages;
+package org.apache.wicket.authentication.pages;
-import wicket.PageParameters;
-import wicket.markup.html.WebPage;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
/**
* Simple sign out page.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
Tue Apr 10 09:06:10 2007
@@ -14,19 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authentication.panel;
+package org.apache.wicket.authentication.panel;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.authentication.AuthenticatedWebSession;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.value.ValueMap;
-import wicket.PageParameters;
-import wicket.authentication.AuthenticatedWebSession;
-import wicket.markup.html.WebMarkupContainer;
-import wicket.markup.html.form.CheckBox;
-import wicket.markup.html.form.Form;
-import wicket.markup.html.form.PasswordTextField;
-import wicket.markup.html.form.TextField;
-import wicket.markup.html.panel.FeedbackPanel;
-import wicket.markup.html.panel.Panel;
-import wicket.model.PropertyModel;
-import wicket.util.value.ValueMap;
/**
* Reusable user sign in panel with username and password as well as support
for
@@ -97,7 +98,7 @@
}
/**
- * @see wicket.markup.html.form.Form#onSubmit()
+ * @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
public final void onSubmit()
{
@@ -113,7 +114,7 @@
}
/**
- * @see wicket.Component#Component(String)
+ * @see org.apache.wicket.Component#Component(String)
*/
public SignInPanel(final String id)
{
@@ -125,7 +126,7 @@
* See Component constructor
* @param includeRememberMe
* True if form should include a remember-me checkbox
- * @see wicket.Component#Component(String)
+ * @see org.apache.wicket.Component#Component(String)
*/
public SignInPanel(final String id, final boolean includeRememberMe)
{
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
Tue Apr 10 09:06:10 2007
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role;
+package org.apache.wicket.authorization.strategies.role;
-import wicket.authorization.IAuthorizationStrategy;
+import org.apache.wicket.authorization.IAuthorizationStrategy;
/**
* Base strategy that uses an instance of
- * [EMAIL PROTECTED]
wicket.authorization.strategies.role.IRoleCheckingStrategy}.
+ * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy}.
*
* @author Eelco Hillenius
*/
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/IRoleCheckingStrategy.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/IRoleCheckingStrategy.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
Tue Apr 10 09:06:10 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role;
+package org.apache.wicket.authorization.strategies.role;
/**
* Strategy for doing role checking. Normally, an implementation of this
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/RoleAuthorizationStrategy.java
Tue Apr 10 09:06:10 2007
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role;
+package org.apache.wicket.authorization.strategies.role;
+
+import
org.apache.wicket.authorization.strategies.CompoundAuthorizationStrategy;
+import
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy;
+import
org.apache.wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import wicket.authorization.strategies.CompoundAuthorizationStrategy;
-import
wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy;
-import
wicket.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
/**
* Compound strategy that works with roles.
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
(from r527094,
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/Roles.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java?view=diff&rev=527174&p1=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/Roles.java&r1=527094&p2=incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/wicket/authorization/strategies/role/Roles.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
Tue Apr 10 09:06:10 2007
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role;
+package org.apache.wicket.authorization.strategies.role;
import java.util.HashSet;
-import wicket.IClusterable;
-import wicket.util.string.StringList;
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.string.StringList;
+
/**
* Utility class for working with roles.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
Tue Apr 10 09:06:10 2007
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.authorization.Action;
+import
org.apache.wicket.authorization.strategies.role.AbstractRoleAuthorizationStrategy;
+import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
+import org.apache.wicket.authorization.strategies.role.Roles;
-import wicket.Component;
-import wicket.authorization.Action;
-import wicket.authorization.strategies.role.AbstractRoleAuthorizationStrategy;
-import wicket.authorization.strategies.role.IRoleCheckingStrategy;
-import wicket.authorization.strategies.role.Roles;
/**
* Strategy that checks the
- * [EMAIL PROTECTED]
wicket.authorization.strategies.role.annotations.AuthorizeInstantiation}
+ * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation}
* annotation.
*
* @author Eelco Hillenius
@@ -43,7 +44,7 @@
}
/**
- * @see
wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
+ * @see
org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
@SuppressWarnings("unchecked")
public boolean isInstantiationAuthorized(final Class componentClass)
@@ -76,8 +77,8 @@
}
/**
- * @see
wicket.authorization.IAuthorizationStrategy#isActionAuthorized(wicket.Component,
- * wicket.authorization.Action)
+ * @see
org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
+ * org.apache.wicket.authorization.Action)
*/
public boolean isActionAuthorized(final Component component, final
Action action)
{
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
Tue Apr 10 09:06:10 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -25,13 +25,13 @@
/**
* A mapping of 1..n roles to an action. This annotions must be embedded in the
- * [EMAIL PROTECTED]
wicket.authorization.strategies.role.annotations.AuthorizeActions}
+ * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeActions}
* annotation.
*
- * @see wicket.authorization.IAuthorizationStrategy
- * @see
wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
- * @see wicket.authorization.strategies.role.annotations.AuthorizeActions
- * @see wicket.authorization.strategies.role.annotations.AuthorizeInstantiation
+ * @see org.apache.wicket.authorization.IAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeActions
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation
*
* @author Eelco Hillenius
*/
@@ -45,10 +45,10 @@
* The action that is allowed. The default actions that are supported by
* Wicket are <code>RENDER</code> and
* <code>ENABLE<code> as defined as constants
- * of [EMAIL PROTECTED] wicket.Component}.
+ * of [EMAIL PROTECTED] org.apache.wicket.Component}.
*
- * @see wicket.Component#RENDER
- * @see wicket.Component#ENABLE
+ * @see org.apache.wicket.Component#RENDER
+ * @see org.apache.wicket.Component#ENABLE
*
* @return the action that is allowed
*/
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
Tue Apr 10 09:06:10 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -40,10 +40,10 @@
* }
* </pre>
*
- * @see wicket.authorization.IAuthorizationStrategy
- * @see
wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
- * @see wicket.authorization.strategies.role.annotations.AuthorizeAction
- * @see wicket.authorization.strategies.role.annotations.AuthorizeInstantiation
+ * @see org.apache.wicket.authorization.IAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeAction
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation
* @author Eelco Hillenius
*/
@Retention(RetentionPolicy.RUNTIME)
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
Tue Apr 10 09:06:10 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -35,10 +35,10 @@
* public class AdminAnnotationsBookmarkablePage extends WebPage
* </pre>
*
- * @see wicket.authorization.IAuthorizationStrategy
- * @see
wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
- * @see wicket.authorization.strategies.role.annotations.AuthorizeActions
- * @see wicket.authorization.strategies.role.annotations.AuthorizeAction
+ * @see org.apache.wicket.authorization.IAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeActions
+ * @see
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeAction
*
* @author Eelco hillenius
*/
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
Tue Apr 10 09:06:10 2007
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.metadata;
+package org.apache.wicket.authorization.strategies.role.metadata;
import java.util.HashMap;
import java.util.Map;
-import wicket.IClusterable;
-import wicket.authorization.Action;
-import wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.authorization.Action;
+import org.apache.wicket.authorization.strategies.role.Roles;
+
/**
* For each Action, holds a set of roles that can perform that action. Roles
can
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
Tue Apr 10 09:06:10 2007
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.metadata;
+package org.apache.wicket.authorization.strategies.role.metadata;
import java.util.HashMap;
import java.util.Map;
-import wicket.Component;
-import wicket.IClusterable;
-import wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.Component;
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.authorization.strategies.role.Roles;
+
/**
* An internal data structure that maps a given component class to a set of
role
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
Tue Apr 10 09:06:10 2007
@@ -14,22 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.metadata;
+package org.apache.wicket.authorization.strategies.role.metadata;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.authorization.Action;
+import
org.apache.wicket.authorization.strategies.role.AbstractRoleAuthorizationStrategy;
+import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
+import org.apache.wicket.authorization.strategies.role.Roles;
-import wicket.Application;
-import wicket.Component;
-import wicket.MetaDataKey;
-import wicket.authorization.Action;
-import wicket.authorization.strategies.role.AbstractRoleAuthorizationStrategy;
-import wicket.authorization.strategies.role.IRoleCheckingStrategy;
-import wicket.authorization.strategies.role.Roles;
/**
* Strategy that uses the Wicket metadata facility to check authorization. The
* static <code>authorize</code> methods are for authorizing component actions
* and component instantiation by role. This class is is the main entry point
* for users wanting to use the roles-based authorization of the
- * wicket-auth-roles package based on wicket metadata.
+ * org.apache.wicket-auth-roles package based on org.apache.wicket metadata.
*
* For instance, use like:
*
@@ -45,7 +46,7 @@
*
* for doing role based authorization for component instantation.
*
- * @see wicket.MetaDataKey
+ * @see org.apache.wicket.MetaDataKey
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -74,7 +75,7 @@
};
/** Special role string for denying access to all */
- public static final String NO_ROLE = "wicket:NO_ROLE";
+ public static final String NO_ROLE = "org.apache.wicket:NO_ROLE";
/**
* Authorizes the given role to create component instances of type
@@ -259,8 +260,8 @@
* Uses component level meta data to match roles for component action
* execution.
*
- * @see
wicket.authorization.IAuthorizationStrategy#isActionAuthorized(wicket.Component,
- * wicket.authorization.Action)
+ * @see
org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
+ * org.apache.wicket.authorization.Action)
*/
public boolean isActionAuthorized(final Component component, final
Action action)
{
@@ -285,7 +286,7 @@
* Uses application level meta data to match roles for component
* instantiation.
*
- * @see
wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
+ * @see
org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
@SuppressWarnings("unchecked")
public boolean isInstantiationAuthorized(final Class componentClass)
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/log4j.properties?view=diff&rev=527174&r1=527173&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/log4j.properties
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/log4j.properties
Tue Apr 10 09:06:10 2007
@@ -9,9 +9,9 @@
# please keep this setting FATAL to avoid questions from users
# why there are stacktraces in the test output. You can turn it
# down if you need to when testing, but don't check it in. (eelco)
-log4j.logger.wicket=FATAL
-log4j.logger.wicket.resource=FATAL
-log4j.logger.wicket.Localizer=FATAL
+log4j.logger.org.apache.wicket=FATAL
+log4j.logger.org.apache.wicket.resource=FATAL
+log4j.logger.org.apache.wicket.Localizer=FATAL
log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AdminPage.java
Tue Apr 10 09:06:10 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
-import wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.WebPage;
/**
* Test page that should only be available for role ADMIN.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
Tue Apr 10 09:06:10 2007
@@ -14,21 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import
org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
+import org.apache.wicket.authorization.UnauthorizedInstantiationException;
+import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
+import
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
+import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.util.tester.ITestPageSource;
+import org.apache.wicket.util.tester.WicketTester;
+
import junit.framework.TestCase;
-import wicket.Component;
-import wicket.Page;
-import wicket.authorization.IUnauthorizedComponentInstantiationListener;
-import wicket.authorization.UnauthorizedInstantiationException;
-import wicket.authorization.strategies.role.IRoleCheckingStrategy;
-import wicket.authorization.strategies.role.RoleAuthorizationStrategy;
-import wicket.authorization.strategies.role.Roles;
-import wicket.util.tester.ITestPageSource;
-import wicket.util.tester.WicketTester;
/**
* Test the annotations package of the auth-roles project.
@@ -168,7 +169,7 @@
}
/**
- * @see
wicket.authorization.strategies.role.IRoleCheckingStrategy#hasAnyRole(Roles)
+ * @see
org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy#hasAnyRole(Roles)
*/
public boolean hasAnyRole(Roles roles)
{
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/NormalPage.java
Tue Apr 10 09:06:10 2007
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.annotations;
+package org.apache.wicket.authorization.strategies.role.annotations;
-import wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.WebPage;
/**
* Test page that has no annotation and should thus be available.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
Tue Apr 10 09:06:10 2007
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.authorization.strategies.role.metadata;
+package org.apache.wicket.authorization.strategies.role.metadata;
import junit.framework.TestCase;
-import wicket.authorization.Action;
-import wicket.authorization.strategies.role.Roles;
+
+import org.apache.wicket.authorization.Action;
+import org.apache.wicket.authorization.strategies.role.Roles;
/**
- * Test case for [EMAIL PROTECTED]
wicket.authorization.strategies.role.metadata.ActionPermissions}.
+ * Test case for [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.metadata.ActionPermissions}.
*
* @author Eelco Hillenius
*/
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?view=diff&rev=527174&r1=527094&r2=527174
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Tue Apr 10 09:06:10 2007
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.util.license;
+package org.apache.wicket.util.license;
+
+import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
/**
* Test that the license headers are in place in this project. The tests are
run
