Synch with current profile handler interfaces

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2195 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java
index 320e418..907e72e 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactQuery.java
@@ -13,15 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package edu.internet2.middleware.shibboleth.idp.profile.saml1;
 
-import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.opensaml.common.binding.decoding.MessageDecoder;
-import org.opensaml.common.binding.encoding.MessageEncoder;
-
 import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
@@ -32,27 +29,15 @@ import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 public class ArtifactQuery extends AbstractSAML1ProfileHandler {
 
     /** {@inheritDoc} */
-    protected MessageDecoder<ServletRequest> getMessageDecoder(ProfileRequest<ServletRequest> request) throws ProfileException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    protected MessageEncoder<ServletResponse> getMessageEncoder(ProfileResponse<ServletResponse> response) throws ProfileException {
+    public String getProfileId() {
         // TODO Auto-generated method stub
         return null;
     }
 
     /** {@inheritDoc} */
-    protected String getUserSessionId(ProfileRequest<ServletRequest> request) {
+    public void processRequest(ProfileRequest<ServletRequest> request, ProfileResponse<ServletResponse> response)
+            throws ProfileException {
         // TODO Auto-generated method stub
-        return null;
-    }
 
-    /** {@inheritDoc} */
-    public void processRequest(ProfileRequest<ServletRequest> request, ProfileResponse<ServletResponse> response) throws ProfileException {
-        // TODO Auto-generated method stub
-        
     }
-
 }
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
index bef39fa..1d9a998 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
@@ -19,9 +19,6 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.opensaml.common.binding.decoding.MessageDecoder;
-import org.opensaml.common.binding.encoding.MessageEncoder;
-
 import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileRequest;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
@@ -32,26 +29,15 @@ import edu.internet2.middleware.shibboleth.common.profile.ProfileResponse;
 public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
     /** {@inheritDoc} */
-    protected MessageDecoder<ServletRequest> getMessageDecoder(ProfileRequest<ServletRequest> request) throws ProfileException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    protected MessageEncoder<ServletResponse> getMessageEncoder(ProfileResponse<ServletResponse> response) throws ProfileException {
+    public String getProfileId() {
         // TODO Auto-generated method stub
         return null;
     }
 
     /** {@inheritDoc} */
-    protected String getUserSessionId(ProfileRequest<ServletRequest> request) {
+    public void processRequest(ProfileRequest<ServletRequest> request, ProfileResponse<ServletResponse> response)
+            throws ProfileException {
         // TODO Auto-generated method stub
-        return null;
-    }
 
-    /** {@inheritDoc} */
-    public void processRequest(ProfileRequest<ServletRequest> request, ProfileResponse<ServletResponse> response) throws ProfileException {
-        // TODO Auto-generated method stub
-        
     }
 }
\ No newline at end of file