diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 14078d58c8..c3b9761c2b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon May 09 00:49:50 GMT 2005 +#Mon Nov 07 22:01:53 EST 2005 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -7,6 +7,51 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..e8bf689b39 --- /dev/null +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +#Mon Nov 07 21:58:48 EST 2005 +eclipse.preferences.version=1 +internal.default.compliance=default diff --git a/core-tiger/src/main/resources/.cvsignore b/core-tiger/src/main/resources/.cvsignore deleted file mode 100644 index 397b4a7624..0000000000 --- a/core-tiger/src/main/resources/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.log diff --git a/core-tiger/src/main/resources/core-tiger.src.main.resources.placeholder b/core-tiger/src/main/resources/core-tiger.src.main.resources.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core-tiger/src/test/resources/.cvsignore b/core-tiger/src/test/resources/.cvsignore deleted file mode 100644 index 397b4a7624..0000000000 --- a/core-tiger/src/test/resources/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.log diff --git a/core-tiger/src/test/resources/core-tiger.src.test.resources.placeholder b/core-tiger/src/test/resources/core-tiger.src.test.resources.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java index 2e37bf7c07..b150bb157b 100644 --- a/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java +++ b/core/src/main/java/org/acegisecurity/taglibs/authz/AuthenticationTag.java @@ -121,7 +121,7 @@ public class AuthenticationTag extends TagSupport { Method method = null; try { - method = clazz.getDeclaredMethod(methodName.toString(), null); + method = clazz.getDeclaredMethod(methodName.toString(), (Class[]) null); } catch (SecurityException se) { throw new JspException(se); } catch (NoSuchMethodException nsme) { @@ -131,7 +131,7 @@ public class AuthenticationTag extends TagSupport { Object retVal = null; try { - retVal = method.invoke(obj, null); + retVal = method.invoke(obj, (Object[]) null); } catch (IllegalArgumentException iae) { throw new JspException(iae); } catch (IllegalAccessException iae) { diff --git a/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java b/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java index 0d2c5722d9..f0056066b1 100644 --- a/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java +++ b/domain/src/main/java/org/acegisecurity/domain/dao/DetachmentContextHolder.java @@ -45,7 +45,7 @@ public class DetachmentContextHolder { * @param alwaysReturnDetached if true then detached instances should be returned. */ public static void setForceReturnOfDetachedInstances(boolean alwaysReturnDetached) { - contextHolder.set(alwaysReturnDetached); + contextHolder.set(new Boolean(alwaysReturnDetached)); } /** @@ -58,6 +58,6 @@ public class DetachmentContextHolder { contextHolder.set(Boolean.FALSE); } - return contextHolder.get(); + return contextHolder.get().booleanValue(); } } diff --git a/domain/src/main/resource/domain.src.main.resources.placeholder b/domain/src/main/resource/domain.src.main.resources.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/domain/src/main/resource/package.html b/domain/src/main/resource/package.html deleted file mode 100644 index 7da7a94b1d..0000000000 --- a/domain/src/main/resource/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -

Domain's main resources

- - - diff --git a/domain/src/test/package.html b/domain/src/test/package.html index 3e9412f529..03c863b3e1 100644 --- a/domain/src/test/package.html +++ b/domain/src/test/package.html @@ -1,6 +1,6 @@ -

Domain's test files

+

Domain's resources.

diff --git a/domain/src/test/resources/.cvsignore b/domain/src/test/resources/.cvsignore deleted file mode 100644 index 397b4a7624..0000000000 --- a/domain/src/test/resources/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.log diff --git a/domain/src/test/resources/domain.src.test.resources.placeholder b/domain/src/test/resources/domain.src.test.resources.placeholder new file mode 100644 index 0000000000..e69de29bb2