[java-identity-provider COMMIT] in /trunk: idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java id...

[noreply at shibboleth.net]

Author: reusser
Date: Thu Aug 11 12:53:58 2011
New Revision: 4007

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4007&view=rev
Log:
- Source format and cleanup
- package-info.java added
- example ToU as HTML

Added:
    trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/package-info.java   (with props)
    trunk/idp-tou-impl/src/main/resources/terms-of-use-example.html   (contents, props changed)
      - copied, changed from r4004, trunk/idp-tou-impl/src/main/resources/terms-of-use-example.txt
Removed:
    trunk/idp-tou-impl/src/main/resources/terms-of-use-example.txt
Modified:
    trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java
    trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseException.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/TermsOfUseEngineImpl.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/ToU.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/ToUHelper.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/ToUServlet.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/storage/JDBCStorage.java
    trunk/idp-tou-impl/src/test/java/net/shibboleth/idp/tou/TestData.java
    trunk/idp-tou-impl/src/test/java/net/shibboleth/idp/tou/ToUHelperTest.java
    trunk/idp-tou-impl/src/test/java/net/shibboleth/idp/tou/ToUTest.java
    trunk/idp-tou-impl/src/test/java/net/shibboleth/idp/tou/storage/AbstractStorageTest.java

Modified: trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java?rev=4007&r1=4006&r2=4007&view=diff
==============================================================================
--- trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java (original)
+++ trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java Thu Aug 11 12:53:58 2011
@@ -28,13 +28,13 @@
     public static enum Decision {
         /** Indicates that no claim is made about terms of use acceptance. */
         UNSPECIFIED,
-        
+
         /**
-         * Indicates that it was not possible to determine th
-         * user's acceptance of the terms of use for the given request.
+         * Indicates that it was not possible to determine th user's acceptance of the terms of use for the given
+         * request.
          */
         INAPPLICABLE,
-        
+
         /** User gave acceptance of the terms of use in the past. */
         PRIOR,
 
@@ -46,7 +46,7 @@
     }
 
     /** Owner of this consent context. */
-    private SubcontextContainer owner;
+    private final SubcontextContainer owner;
 
     /** The decision determined by the terms of use engine. */
     private Decision termsOfUseDecision;
@@ -56,10 +56,10 @@
      * 
      * @param superContext owner of this context
      */
-    public TermsOfUseContext(SubcontextContainer superContext) {
+    public TermsOfUseContext(final SubcontextContainer superContext) {
         Assert.isNotNull(superContext, "Owning super context may not be null");
         owner = superContext;
-        
+
         termsOfUseDecision = Decision.UNSPECIFIED;
     }
 
@@ -82,7 +82,7 @@
      * 
      * @param decision terms of use decision established by the user
      */
-    public void setTermsOfUseDecision(Decision decision) {
+    public void setTermsOfUseDecision(final Decision decision) {
         termsOfUseDecision = decision;
     }
 }

Modified: trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseException.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseException.java?rev=4007&r1=4006&r2=4007&view=diff
==============================================================================
--- trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseException.java (original)
+++ trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseException.java Thu Aug 11 12:53:58 2011
@@ -33,7 +33,7 @@
      * 
      * @param message exception message
      */
-    public TermsOfUseException(String message) {
+    public TermsOfUseException(final String message) {
         super(message);
     }
 
@@ -42,7 +42,7 @@
      * 
      * @param wrappedException exception to be wrapped by this one
      */
-    public TermsOfUseException(Exception wrappedException) {
+    public TermsOfUseException(final Exception wrappedException) {
         super(wrappedException);
     }
 
@@ -52,7 +52,7 @@
      * @param message exception message
      * @param wrappedException exception to be wrapped by this one
      */
-    public TermsOfUseException(String message, Exception wrappedException) {
+    public TermsOfUseException(final String message, final Exception wrappedException) {
         super(message, wrappedException);
     }
 }

Modified: trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/TermsOfUseEngineImpl.java

[... 232 lines stripped ...]