Author: gseitz
Date: Mon Oct 15 15:52:42 2007
New Revision: 584962
URL: http://svn.apache.org/viewvc?rev=584962&view=rev
Log:
WICKET-1078
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.ui.prefs
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.core.prefs?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.core.prefs
(original)
+++ wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.core.prefs
Mon Oct 15 15:52:42 2007
@@ -53,9 +53,11 @@
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -65,7 +67,7 @@
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=100
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
@@ -152,7 +154,7 @@
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not
insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not
insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
@@ -238,7 +240,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not
insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not
insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not
insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not
insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
@@ -255,12 +257,12 @@
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=2
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.ui.prefs?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.ui.prefs
(original)
+++ wicket/trunk/jdk-1.5/wicket-auth-roles/.settings/org.eclipse.jdt.ui.prefs
Mon Oct 15 15:52:42 2007
@@ -2,4 +2,53 @@
eclipse.preferences.version=1
formatter_profile=_Wicket
formatter_settings_version=11
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
internal.default.compliance=default
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\r\n * Gets ${bare_field_name}.\r\n * @return
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="settercomment_context" deleted\="false" description\="Comment for
setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\r\n * Sets ${bare_field_name}.\r\n * @param ${param}
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\r\n * Construct.\r\n
* ${tags}\r\n */</template><template autoinsert\="false"
context\="filecomment_context" deleted\="false" description\="Comment for
created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment"/><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\r\n * @author ${user}\r\n * ${tags}\r\n
*/</template><template autoinsert\="true" context\="fieldcomment_context"
deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\r\n * ${tags}
\r\n */</template><template autoinsert\="false"
context\="overridecomment_context" deleted\="false" description\="Comment for
overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n
*/</template><template autoinsert\="false" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n *
Licensed to the Apache Software Foundation (ASF) under one or more\r\n *
contributor license agreements. See the NOTICE file distributed with\r\n *
this work for additional information regarding copyright ownership.\r\n * The
ASF licenses this file to You under the Apache License, Version 2.0\r\n * (the
"License"); you may not use this file except in compliance with\r\n * the
License. You may obtain a copy of the License at\r\n *\r\n *
http\://www.apache.org/licenses/LICENSE-2.0\r\
n *\r\n * Unless required by applicable law or agreed to in writing,
software\r\n * distributed under the License is distributed on an "AS IS"
BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.\r\n * See the License for the specific language governing permissions
and\r\n * limitations under the License.\r\n
*/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template
autoinsert\="false" context\="catchblock_context" deleted\="false"
description\="Code in new catch blocks" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw
new RuntimeException(${exception_var});</template><template autoinsert\="false"
context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody"
name\="methodbody">${body_statement}</template><template autoinsert\="false"
context\="c
onstructorbody_context" deleted\="false" description\="Code in created
constructor stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false"
description\="Code in created getters" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template><template autoinsert\="true"
context\="classbody_context" deleted\="false" description\="Code in new class
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\r\n</template><template autoinsert\="true"
context\="interfacebody_context" deleted\="false"
description\="Code in new interface type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\r\n</template><template autoinsert\="true"
context\="enumbody_context" deleted\="false" description\="Code in new enum
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\r\n</template><template autoinsert\="true"
context\="annotationbody_context" deleted\="false" description\="Code in new
annotation type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="annotationbody">\r\n</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for
delegate methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment"
name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n
*/</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
Mon Oct 15 15:52:42 2007
@@ -45,7 +45,7 @@
IUnauthorizedComponentInstantiationListener
{
/** Subclass of authenticated web session to instantiate */
- private final WeakReference<Class<? extends AuthenticatedWebSession>>
webSessionClassRef;
+ private final WeakReference<Class< ? extends AuthenticatedWebSession>>
webSessionClassRef;
/**
* Constructor
@@ -53,7 +53,8 @@
public AuthenticatedWebApplication()
{
// Get web session class to instantiate
- this.webSessionClassRef = new WeakReference<Class<? extends
AuthenticatedWebSession>>(getWebSessionClass());
+ this.webSessionClassRef = new WeakReference<Class< ? extends
AuthenticatedWebSession>>(
+ getWebSessionClass());
}
@Override
@@ -110,31 +111,31 @@
{
try
{
- return
webSessionClassRef.get().getDeclaredConstructor(AuthenticatedWebApplication.class,
-
Request.class).newInstance(AuthenticatedWebApplication.this, request);
+ return webSessionClassRef.get().getDeclaredConstructor(
+ AuthenticatedWebApplication.class,
Request.class).newInstance(
+ AuthenticatedWebApplication.this,
request);
}
catch (Exception e)
{
- throw new WicketRuntimeException(
- "Unable to instantiate web session " +
webSessionClassRef.get(), e);
+ throw new WicketRuntimeException("Unable to instantiate
web session " +
+ webSessionClassRef.get(), e);
}
}
/**
- * @return AuthenticatedWebSession subclass to use in this
authenticated web
- * application.
+ * @return AuthenticatedWebSession subclass to use in this
authenticated web application.
*/
- protected abstract Class<? extends AuthenticatedWebSession>
getWebSessionClass();
+ protected abstract Class< ? extends AuthenticatedWebSession>
getWebSessionClass();
/**
* @return Subclass of sign-in page
*/
- protected abstract Class<? extends WebPage> getSignInPageClass();
+ protected abstract Class< ? extends WebPage> getSignInPageClass();
/**
- * Called when an AUTHENTICATED user tries to navigate to a page that
they
- * are not authorized to access. You might want to override this to
navigate
- * to some explanatory page or to the application's home page.
+ * Called when an AUTHENTICATED user tries to navigate to a page that
they are not authorized to
+ * access. You might want to override this to navigate to some
explanatory page or to the
+ * application's home page.
*
* @param page
* The page
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebSession.java
Mon Oct 15 15:52:42 2007
@@ -23,9 +23,8 @@
/**
- * Basic authenticated web session. Subclasses must provide a method that
- * authenticates the session based on a username and password, and a method
- * implementation that gets the Roles
+ * Basic authenticated web session. Subclasses must provide a method that
authenticates the session
+ * based on a username and password, and a method implementation that gets the
Roles
*
* @author Jonathan Locke
*/
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
Mon Oct 15 15:52:42 2007
@@ -35,7 +35,7 @@
{
this(null);
}
-
+
/**
* Constructor
*
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/panel/SignInPanel.java
Mon Oct 15 15:52:42 2007
@@ -30,11 +30,10 @@
/**
- * Reusable user sign in panel with username and password as well as support
for
- * cookie persistence of the both. When the SignInPanel's form is submitted,
the
- * method signIn(String, String) is called, passing the username and password
- * submitted. The signIn() method should authenticate the user's session. The
- * default implementation calls AuthenticatedWebSession.get().signIn().
+ * Reusable user sign in panel with username and password as well as support
for cookie persistence
+ * of the both. When the SignInPanel's form is submitted, the method
signIn(String, String) is
+ * called, passing the username and password submitted. The signIn() method
should authenticate the
+ * user's session. The default implementation calls
AuthenticatedWebSession.get().signIn().
*
* @author Jonathan Locke
* @author Juergen Donnerstag
@@ -104,11 +103,11 @@
{
if (signIn(getUsername(), getPassword()))
{
- onSignInSucceeded();
+ onSignInSucceeded();
}
else
{
- onSignInFailed();
+ onSignInFailed();
}
}
}
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/AbstractRoleAuthorizationStrategy.java
Mon Oct 15 15:52:42 2007
@@ -64,9 +64,9 @@
}
/**
- * Conducts a check to see if the roles object is empty. Since the roles
- * object does not contain any null values and will always hold an empty
- * string, an extra test is required beyond roles.isEmpty().
+ * Conducts a check to see if the roles object is empty. Since the
roles object does not contain
+ * any null values and will always hold an empty string, an extra test
is required beyond
+ * roles.isEmpty().
*
* @param roles
* the Roles object to test
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/IRoleCheckingStrategy.java
Mon Oct 15 15:52:42 2007
@@ -17,11 +17,10 @@
package org.apache.wicket.authorization.strategies.role;
/**
- * Strategy for doing role checking. Normally, an implementation of this
- * strategy interface would look in the current session for credentials that
- * indicate what roles the current user can take on, but any kind of strategy
is
- * possible. For example, you could have a role checking strategy that allowed
- * gave users the ADMIN role between 9AM and 5PM.
+ * Strategy for doing role checking. Normally, an implementation of this
strategy interface would
+ * look in the current session for credentials that indicate what roles the
current user can take
+ * on, but any kind of strategy is possible. For example, you could have a
role checking strategy
+ * that allowed gave users the ADMIN role between 9AM and 5PM.
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -29,14 +28,14 @@
public interface IRoleCheckingStrategy
{
/**
- * Whether any of the given roles matches. For example, if a user has
role
- * USER and the provided roles are {USER, ADMIN} this method should
return
- * true as the user has at least one of the roles that were provided.
+ * Whether any of the given roles matches. For example, if a user has
role USER and the provided
+ * roles are {USER, ADMIN} this method should return true as the user
has at least one of the
+ * roles that were provided.
*
* @param roles
* the roles
- * @return true if a user or whatever subject this implementation wants
to
- * work with has at least on of the provided roles
+ * @return true if a user or whatever subject this implementation wants
to work with has at
+ * least on of the provided roles
*/
boolean hasAnyRole(Roles roles);
}
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/Roles.java
Mon Oct 15 15:52:42 2007
@@ -31,10 +31,10 @@
public final class Roles extends HashSet<String> implements IClusterable
{
private static final long serialVersionUID = 1L;
-
+
/** USER role (for use in annotations) */
public static final String USER = "USER";
-
+
/** ADMIN role (for use in annotations) */
public static final String ADMIN = "ADMIN";
@@ -116,8 +116,8 @@
*
* @param roles
* the roles to check
- * @return true if it contains all the roles or the provided roles
object is
- * null, false otherwise
+ * @return true if it contains all the roles or the provided roles
object is null, false
+ * otherwise
*/
public boolean hasAllRoles(Roles roles)
{
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java
Mon Oct 15 15:52:42 2007
@@ -83,7 +83,7 @@
public boolean isActionAuthorized(final Component component, final
Action action)
{
// Get component's class
- final Class<? extends Component> componentClass =
component.getClass();
+ final Class< ? extends Component> componentClass =
component.getClass();
// Check for a single action
if (!check(action,
componentClass.getAnnotation(AuthorizeAction.class)))
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeAction.java
Mon Oct 15 15:52:42 2007
@@ -25,8 +25,7 @@
/**
* A mapping of 1..n roles to an action. This annotions must be embedded in the
- * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeActions}
- * annotation.
+ * [EMAIL PROTECTED]
org.apache.wicket.authorization.strategies.role.annotations.AuthorizeActions}
annotation.
*
* @see org.apache.wicket.authorization.IAuthorizationStrategy
* @see
org.apache.wicket.authorization.strategies.role.annotations.AnnotationsRoleAuthorizationStrategy
@@ -42,9 +41,8 @@
public @interface AuthorizeAction {
/**
- * 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
+ * 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] org.apache.wicket.Component}.
*
* @see org.apache.wicket.Component#RENDER
@@ -57,16 +55,16 @@
/**
* The roles for this action.
*
- * @return the roles for this action. The default is an empty string
- * (annotations do not allow null default values)
+ * @return the roles for this action. The default is an empty string
(annotations do not allow
+ * null default values)
*/
String[] roles() default "";
/**
* The roles to deny for this action.
*
- * @return the roles to deny for this action. The default is an empty
string
- * (annotations do not allow null default values)
+ * @return the roles to deny for this action. The default is an empty
string (annotations do not
+ * allow null default values)
*/
String[] deny() default "";
}
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeActions.java
Mon Oct 15 15:52:42 2007
@@ -24,13 +24,12 @@
import java.lang.annotation.Target;
/**
- * Groups a set (technically an array) of [EMAIL PROTECTED] AuthorizeAction}s
for
- * authorization. This annotation works on a class level, and can be used like
- * this:
+ * Groups a set (technically an array) of [EMAIL PROTECTED] AuthorizeAction}s
for authorization. This
+ * annotation works on a class level, and can be used like this:
*
* <pre>
* // A panel that is only visible for users with role ADMIN
- * @AuthorizeAction(action = "RENDER", roles = {
"ADMIN", "USER" })
+ * @AuthorizeAction(action = "RENDER", roles = {
"ADMIN", "USER" })
* public class ForAdminsAndUsers extends Panel
* {
* public ForAdminsAndUsers(String id)
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/annotations/AuthorizeInstantiation.java
Mon Oct 15 15:52:42 2007
@@ -24,14 +24,13 @@
import java.lang.annotation.Target;
/**
- * Annotation for configuring what roles are allowed for instantiation the
- * annotated component or package. This annotation can be used for classes and
- * packages, and can be used like this:
+ * Annotation for configuring what roles are allowed for instantiation the
annotated component or
+ * package. This annotation can be used for classes and packages, and can be
used like this:
*
* <pre>
* // only users with role ADMIN are allowed to create instances of this
page, whether it is
* // either bookmarkable or not
- * @AuthorizeInstantiation("ADMIN")
+ * @AuthorizeInstantiation("ADMIN")
* public class AdminAnnotationsBookmarkablePage extends WebPage
* </pre>
*
@@ -51,8 +50,7 @@
/**
* Gets the roles that are allowed to take the action.
*
- * @return the roles that are allowed. Returns a zero length array by
- * default
+ * @return the roles that are allowed. Returns a zero length array by
default
*/
String[] value() default {};
}
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissions.java
Mon Oct 15 15:52:42 2007
@@ -25,10 +25,9 @@
/**
- * For each Action, holds a set of roles that can perform that action. Roles
can
- * be granted access to a given action via authorize(Action, String role) and
- * denied access via unauthorize(Action, String role). All permissions can be
- * removed for a given action via authorizeAll(Action).
+ * For each Action, holds a set of roles that can perform that action. Roles
can be granted access
+ * to a given action via authorize(Action, String role) and denied access via
unauthorize(Action,
+ * String role). All permissions can be removed for a given action via
authorizeAll(Action).
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -49,7 +48,7 @@
* The roles
*/
public final void authorize(final Action action, final Roles rolesToAdd)
- {
+ {
if (action == null)
{
throw new IllegalArgumentException("Argument action
cannot be null");
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissions.java
Mon Oct 15 15:52:42 2007
@@ -25,11 +25,10 @@
/**
- * An internal data structure that maps a given component class to a set of
role
- * strings. Permissions can be granted to instantiate a given component class
- * via authorize(Class, Roles roles) and denied via unauthorize(Class, Roles
- * roles). All authorization can be removed for a given class with
- * authorizeAll(Class).
+ * An internal data structure that maps a given component class to a set of
role strings.
+ * Permissions can be granted to instantiate a given component class via
authorize(Class, Roles
+ * roles) and denied via unauthorize(Class, Roles roles). All authorization
can be removed for a
+ * given class with authorizeAll(Class).
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -92,8 +91,8 @@
*
* @param componentClass
* the component class
- * @return the roles that have a binding with the given component
class, or
- * null if no entries are found
+ * @return the roles that have a binding with the given component
class, or null if no entries
+ * are found
*/
public Roles authorizedRoles(final Class< ? extends Component>
componentClass)
{
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/java/org/apache/wicket/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
Mon Oct 15 15:52:42 2007
@@ -26,11 +26,10 @@
/**
- * 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.
+ * 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.
*
* For instance, use like:
*
@@ -54,9 +53,8 @@
public class MetaDataRoleAuthorizationStrategy extends
AbstractRoleAuthorizationStrategy
{
/**
- * Component meta data key for ations/ roles information. Typically,
you do
- * not need to use this meta data key directly, but instead use one of
the
- * bind methods of this class.
+ * Component meta data key for ations/ roles information. Typically,
you do not need to use this
+ * meta data key directly, but instead use one of the bind methods of
this class.
*/
public static final MetaDataKey ACTION_PERMISSIONS = new
MetaDataKey(ActionPermissions.class)
{
@@ -64,9 +62,8 @@
};
/**
- * Application meta data key for ations/ roles information. Typically,
you
- * do not need to use this meta data key directly, but instead use one
of
- * the bind methods of this class.
+ * Application meta data key for ations/ roles information. Typically,
you do not need to use
+ * this meta data key directly, but instead use one of the bind methods
of this class.
*/
public static final MetaDataKey INSTANTIATION_PERMISSIONS = new
MetaDataKey(
InstantiationPermissions.class)
@@ -78,15 +75,14 @@
public static final String NO_ROLE = "wicket:NO_ROLE";
/**
- * Authorizes the given role to create component instances of type
- * componentClass. This authorization is added to any previously
authorized
- * roles.
+ * Authorizes the given role to create component instances of type
componentClass. This
+ * authorization is added to any previously authorized roles.
*
* @param componentClass
* The component type that is subject for the authorization
* @param roles
- * The comma separated roles that are authorized to create
- * component instances of type componentClass
+ * The comma separated roles that are authorized to create
component instances of
+ * type componentClass
*/
public static final void authorize(final Class< ? extends Component>
componentClass,
final String roles)
@@ -103,8 +99,7 @@
}
/**
- * Authorizes the given role to perform the given action on the given
- * component.
+ * Authorizes the given role to perform the given action on the given
component.
*
* @param component
* The component that is subject to the authorization
@@ -127,8 +122,7 @@
}
/**
- * Grants permission to all roles to create instances of the given
component
- * class.
+ * Grants permission to all roles to create instances of the given
component class.
*
* @param componentClass
* The component class
@@ -145,8 +139,7 @@
}
/**
- * Grants permission to all roles to perform the given action on the
given
- * component.
+ * Grants permission to all roles to perform the given action on the
given component.
*
* @param component
* The component that is subject to the authorization
@@ -164,19 +157,17 @@
}
/**
- * Removes permission for the given roles to create instances of the
given
- * component class. There is no danger in removing authorization by
calling
- * this method. If the last authorization grant is removed for a given
- * componentClass, the internal role NO_ROLE will automatically be
added,
- * effectively denying access to all roles (if this was not done, all
roles
- * would suddenly have access since no authorization is equivalent to
full
- * access).
+ * Removes permission for the given roles to create instances of the
given component class.
+ * There is no danger in removing authorization by calling this method.
If the last
+ * authorization grant is removed for a given componentClass, the
internal role NO_ROLE will
+ * automatically be added, effectively denying access to all roles (if
this was not done, all
+ * roles would suddenly have access since no authorization is
equivalent to full access).
*
* @param componentClass
* The component type
* @param roles
- * The comma separated list of roles that are no longer to be
- * authorized to create instances of type componentClass
+ * The comma separated list of roles that are no longer to
be authorized to create
+ * instances of type componentClass
*/
public static final void unauthorize(final Class< ? extends Component>
componentClass,
final String roles)
@@ -190,21 +181,19 @@
}
/**
- * Removes permission for the given role to perform the given action on
the
- * given component. There is no danger in removing authorization by
calling
- * this method. If the last authorization grant is removed for a given
- * action, the internal role NO_ROLE will automatically be added,
- * effectively denying access to all roles (if this was not done, all
roles
- * would suddenly have access since no authorization is equivalent to
full
- * access).
+ * Removes permission for the given role to perform the given action on
the given component.
+ * There is no danger in removing authorization by calling this method.
If the last
+ * authorization grant is removed for a given action, the internal role
NO_ROLE will
+ * automatically be added, effectively denying access to all roles (if
this was not done, all
+ * roles would suddenly have access since no authorization is
equivalent to full access).
*
* @param component
* The component
* @param action
* The action
* @param roles
- * The comma separated list of roles that are no longer
allowed
- * to perform the given action
+ * The comma separated list of roles that are no longer
allowed to perform the given
+ * action
*/
public static final void unauthorize(final Component component, final
Action action,
final String roles)
@@ -218,8 +207,8 @@
}
/**
- * Grants authorization to instantiate the given class to just the role
- * NO_ROLE, effectively denying all other roles.
+ * Grants authorization to instantiate the given class to just the role
NO_ROLE, effectively
+ * denying all other roles.
*
* @param componentClass
* The component class
@@ -231,8 +220,8 @@
}
/**
- * Grants authorization to perform the given action to just the role
- * NO_ROLE, effectively denying all other roles.
+ * Grants authorization to perform the given action to just the role
NO_ROLE, effectively
+ * denying all other roles.
*
* @param component
* the component that is subject to the authorization
@@ -257,8 +246,7 @@
}
/**
- * Uses component level meta data to match roles for component action
- * execution.
+ * Uses component level meta data to match roles for component action
execution.
*
* @see
org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
@@ -283,8 +271,7 @@
}
/**
- * Uses application level meta data to match roles for component
- * instantiation.
+ * Uses application level meta data to match roles for component
instantiation.
*
* @see
org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
@@ -299,8 +286,8 @@
// as long as the interface does not use generics, we should
check this
if (!Component.class.isAssignableFrom(componentClass))
{
- throw new IllegalArgumentException("argument
componentClass must be of type "
- + Component.class.getName());
+ throw new IllegalArgumentException("argument
componentClass must be of type " +
+ Component.class.getName());
}
final Roles roles =
rolesAuthorizedToInstantiate(componentClass);
@@ -312,13 +299,12 @@
}
/**
- * Gets the roles for creation of the given component class, or null if
none
- * were registered.
+ * Gets the roles for creation of the given component class, or null if
none were registered.
*
* @param componentClass
* the component class
- * @return the roles that are authorized for creation of the
componentClass,
- * or null if no specific authorization was configured
+ * @return the roles that are authorized for creation of the
componentClass, or null if no
+ * specific authorization was configured
*/
private static Roles rolesAuthorizedToInstantiate(
final Class< ? extends Component> componentClass)
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
Mon Oct 15 15:52:42 2007
@@ -38,9 +38,9 @@
*/
public class AnnotationsRoleTest extends TestCase
{
- WicketTester tester;
+ WicketTester tester;
- /**
+ /**
* Construct.
*/
public AnnotationsRoleTest()
@@ -58,14 +58,18 @@
super(arg0);
}
- @Override
- protected void setUp() throws Exception {
- tester = new WicketTester();
- }
- @Override
- protected void tearDown() throws Exception {
- tester.destroy();
- }
+ @Override
+ protected void setUp() throws Exception
+ {
+ tester = new WicketTester();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ tester.destroy();
+ }
+
/**
* @throws Exception
*/
@@ -123,7 +127,8 @@
}
}
Listener listener = new Listener();
-
tester.getApplication().getSecuritySettings().setUnauthorizedComponentInstantiationListener(listener);
+ tester.getApplication().getSecuritySettings()
+
.setUnauthorizedComponentInstantiationListener(listener);
try
{
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
Mon Oct 15 15:52:42 2007
@@ -38,6 +38,7 @@
/**
* Construct.
+ *
* @param arg0
*/
public ActionPermissionsTest(String arg0)
Modified:
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=584962&r1=584961&r2=584962&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-auth-roles/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Mon Oct 15 15:52:42 2007
@@ -16,12 +16,10 @@
*/
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
- * from [EMAIL PROTECTED] ApacheLicenseHeaderTestCase}, but you can add
project specific
- * tests here if needed.
+ * Test that the license headers are in place in this project. The tests are
run from
+ * [EMAIL PROTECTED] ApacheLicenseHeaderTestCase}, but you can add project
specific tests here if needed.
*
* @author Frank Bille Jensen (frankbille)
*/
@@ -32,20 +30,16 @@
*/
public ApacheLicenceHeaderTest()
{
-// addHeaders = true;
-
+ // addHeaders = true;
+
/*
* License header in test files lower the visibility of the
test.
*/
- htmlIgnore = new String[] {
- "src/test/java"
- };
-
+ htmlIgnore = new String[] { "src/test/java" };
+
/*
* Low level configuration files for logging. No license needed.
*/
- propertiesIgnore = new String[] {
- "src/test/java"
- };
+ propertiesIgnore = new String[] { "src/test/java" };
}
}
