Move to using code and libs in shib-common
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 16 Nov 2006 00:40:43 +0000 (00:40 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 16 Nov 2006 00:40:43 +0000 (00:40 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2077 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

27 files changed:
.classpath
.settings/org.eclipse.jdt.ui.prefs
build-lib/jsp-2.0.jar [new file with mode: 0644]
build-lib/junit-3.8.1.jar [deleted file]
build-lib/log4j-1.2.13.jar [deleted file]
build-lib/servlet-2.3.jar [deleted file]
lib/spring-2.0-beans.jar [deleted file]
lib/spring-2.0-commons-collections.jar [deleted file]
lib/spring-2.0-commons-logging.jar [deleted file]
lib/spring-2.0-context.jar [deleted file]
lib/spring-2.0-core.jar [deleted file]
lib/spring-2.0-support.jar [deleted file]
lib/spring-2.0-web.jar [deleted file]
lib/spring-2.0-webmvc.jar [deleted file]
src/edu/internet2/middleware/shibboleth/idp/profile/ProfileHandler.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/profile/adfs/SingleSignOn.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSO.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AuthenticationRequest.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/LogoutRequest.java
src/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/session/LoginEvent.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/session/LogoutEvent.java [deleted file]
src/edu/internet2/middleware/shibboleth/idp/session/Session.java

index 0c13710..6c8e4f9 100644 (file)
@@ -3,10 +3,6 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="tests"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/OpenSAML2-J"/>
-       <classpathentry kind="lib" path="build-lib/junit-3.8.1.jar"/>
-       <classpathentry kind="lib" path="build-lib/log4j-1.2.13.jar"/>
-       <classpathentry kind="lib" path="build-lib/servlet-2.3.jar"/>
        <classpathentry kind="lib" path="lib/bc-asn1.jar"/>
        <classpathentry kind="lib" path="lib/bsh-2.0b1.jar"/>
        <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
        <classpathentry kind="lib" path="build-lib/ant-junit-1.6.3.jar"/>
        <classpathentry kind="lib" path="build-lib/ant-launcher-1.6.3.jar"/>
        <classpathentry kind="lib" path="build-lib/ant-nodeps-1.6.3.jar"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/XMLTooling-J"/>
        <classpathentry kind="lib" path="build-lib/mockrunner-servlet.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-core.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-context.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-commons-logging.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-commons-collections.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-beans.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-web.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-webmvc.jar"/>
-       <classpathentry kind="lib" path="lib/spring-2.0-support.jar"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/java-shib-common"/>
+       <classpathentry kind="lib" path="build-lib/jsp-2.0.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>
index 1df6e1f..df8328d 100644 (file)
@@ -1,4 +1,4 @@
-#Sun Nov 12 17:42:50 EST 2006
+#Wed Nov 15 19:40:04 EST 2006
 eclipse.preferences.version=1
 formatter_profile=_Internet2 Format
 formatter_settings_version=10
@@ -7,4 +7,4 @@ org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\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">/**\n * Constructor\n *\n * ${tags}\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">/*\n * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><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">/**\n *\n * ${tags}\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">/**\n * \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">/**\n * ${tags}\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">/*\n * ${see_to_overridden}\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">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</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></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\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">/**\n * Constructor\n *\n * ${tags}\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">/*\n * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><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">/**\n *\n * ${tags}\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">/**\n * \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">/**\n * ${tags}\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">/** {@inheritDoc} */</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">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</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></templates>
diff --git a/build-lib/jsp-2.0.jar b/build-lib/jsp-2.0.jar
new file mode 100644 (file)
index 0000000..073461b
Binary files /dev/null and b/build-lib/jsp-2.0.jar differ
diff --git a/build-lib/junit-3.8.1.jar b/build-lib/junit-3.8.1.jar
deleted file mode 100755 (executable)
index 674d71e..0000000
Binary files a/build-lib/junit-3.8.1.jar and /dev/null differ
diff --git a/build-lib/log4j-1.2.13.jar b/build-lib/log4j-1.2.13.jar
deleted file mode 100644 (file)
index dde9972..0000000
Binary files a/build-lib/log4j-1.2.13.jar and /dev/null differ
diff --git a/build-lib/servlet-2.3.jar b/build-lib/servlet-2.3.jar
deleted file mode 100755 (executable)
index d368d0f..0000000
Binary files a/build-lib/servlet-2.3.jar and /dev/null differ
diff --git a/lib/spring-2.0-beans.jar b/lib/spring-2.0-beans.jar
deleted file mode 100644 (file)
index 19fe7c5..0000000
Binary files a/lib/spring-2.0-beans.jar and /dev/null differ
diff --git a/lib/spring-2.0-commons-collections.jar b/lib/spring-2.0-commons-collections.jar
deleted file mode 100644 (file)
index 75580be..0000000
Binary files a/lib/spring-2.0-commons-collections.jar and /dev/null differ
diff --git a/lib/spring-2.0-commons-logging.jar b/lib/spring-2.0-commons-logging.jar
deleted file mode 100644 (file)
index 2ff9bbd..0000000
Binary files a/lib/spring-2.0-commons-logging.jar and /dev/null differ
diff --git a/lib/spring-2.0-context.jar b/lib/spring-2.0-context.jar
deleted file mode 100644 (file)
index 1dfb44f..0000000
Binary files a/lib/spring-2.0-context.jar and /dev/null differ
diff --git a/lib/spring-2.0-core.jar b/lib/spring-2.0-core.jar
deleted file mode 100644 (file)
index 560bd93..0000000
Binary files a/lib/spring-2.0-core.jar and /dev/null differ
diff --git a/lib/spring-2.0-support.jar b/lib/spring-2.0-support.jar
deleted file mode 100644 (file)
index 30b3a42..0000000
Binary files a/lib/spring-2.0-support.jar and /dev/null differ
diff --git a/lib/spring-2.0-web.jar b/lib/spring-2.0-web.jar
deleted file mode 100644 (file)
index 9f7ac31..0000000
Binary files a/lib/spring-2.0-web.jar and /dev/null differ
diff --git a/lib/spring-2.0-webmvc.jar b/lib/spring-2.0-webmvc.jar
deleted file mode 100644 (file)
index 5fac12a..0000000
Binary files a/lib/spring-2.0-webmvc.jar and /dev/null differ
diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/ProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/ProfileHandler.java
deleted file mode 100644 (file)
index d36008e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.internet2.middleware.shibboleth.idp.profile;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A processor for a communication profile supported by the IdP.
- * 
- * Profile handlers must be stateless and thread-safe as a single instance may be used to service every incoming request.
- */
-public interface ProfileHandler {
-    
-    /**
-     * Processes an incoming request.
-     * 
-     * @param request the request
-     * @param response the response
-     * 
-     * @return true if this handler has processed the request, false if not
-     * 
-     * @throws ServletException throw if there was a problem while processing the request
-     */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException;
-}
\ No newline at end of file
index 640ac91..c70bb30 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.adfs;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * ADFS (Active Directory Federation Service) single sign-on profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class SingleSignOn implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 04a62ca..c3ad48a 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 1 Artifact Query profile handler.
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class ArtifactQuery implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 2a64c0e..4f1d55c 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 1 Attribute Query profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class AttributeQuery implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 3a0ee3f..2a70533 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * Shibboleth, version 1.X, single sign-on profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class ShibbolethSSO implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 2650867..f0d4379 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 2.0 Artifact resolution profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class ArtifactResolution implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 12e4657..1792e4c 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 2.0 Attribute Query profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class AttributeQuery implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 0a1ca55..e189392 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 2.0 Authentication Request profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class AuthenticationRequest implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
index 0514502..61b5556 100644 (file)
 package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
-import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
+import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 
 /**
  * SAML 2.0 Logout Request profile handler
@@ -27,7 +27,7 @@ import edu.internet2.middleware.shibboleth.idp.profile.ProfileHandler;
 public class LogoutRequest implements ProfileHandler {
 
     /** {@inheritDoc} */
-    public boolean processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    public boolean processRequest(ServletRequest request, ServletResponse response) throws ServletException {
         // TODO Auto-generated method stub
         return false;
     }
diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java b/src/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java
deleted file mode 100644 (file)
index a1b198d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.idp.session;
-
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-/**
- * A listener that listens for the destruction of {@link HttpSession}s.  This allows
- * the {@link SessionManager} to appropriately destroy a shibboleth session whether the 
- * HTTP session is destroyed explicitly or through inactivity.
- */
-public class ContainerSessionListener implements HttpSessionListener {
-
-    /**
-     * A no-op operation.
-     */
-    public void sessionCreated(HttpSessionEvent arg0) {
-        // we don't care about session creations
-    }
-
-    /** {@inheritDoc} */
-    public void sessionDestroyed(HttpSessionEvent arg0) {
-        // TODO Auto-generated method stub
-
-    }
-}
\ No newline at end of file
diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/LoginEvent.java b/src/edu/internet2/middleware/shibboleth/idp/session/LoginEvent.java
deleted file mode 100644 (file)
index 6cdfac0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.idp.session;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * An event representing the creation of a Shibboleth session that occured 
- * because a user logged into the system.
- */
-public class LoginEvent extends ApplicationEvent {
-
-    public LoginEvent(SessionManager sessionManager){
-        super(sessionManager);
-    }
-}
\ No newline at end of file
diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/LogoutEvent.java b/src/edu/internet2/middleware/shibboleth/idp/session/LogoutEvent.java
deleted file mode 100644 (file)
index 0e92e11..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright [2006] [University Corporation for Advanced Internet Development, Inc.]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.idp.session;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * An event representing the destruction of a Shibboleth session that occured 
- * because a user logged out of the system or because the application timed out.
- */
-public class LogoutEvent extends ApplicationEvent {
-
-    public LogoutEvent(SessionManager sessionManager){
-        super(sessionManager);
-    }
-}
index 2a62ec2..8a55aba 100644 (file)
@@ -18,33 +18,10 @@ package edu.internet2.middleware.shibboleth.idp.session;
 
 import java.util.List;
 
-import org.joda.time.DateTime;
-
 /**
  * Session information for user logged into the IdP.
  */
-public interface Session {
-
-    /**
-     * Gets the unique identifier of the session.
-     * 
-     * @return unique identifier of the session
-     */
-    public String getSessionID();
-
-    /**
-     * Gets the principal ID of the user.
-     * 
-     * @return principal ID of the user
-     */
-    public String getPrincipalID();
-
-    /**
-     * Gets the time of the last activity from the user.
-     * 
-     * @return time of the last activity from the user
-     */
-    public DateTime getLastActivityInstance();
+public interface Session extends edu.internet2.middleware.shibboleth.common.session.Session{
 
     /**
      * Gets the methods by which the user has authenticated to the IdP.