Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 12:51:29 -0400 (Tue, 25 Aug 2009)
New Revision: 739
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/interfaces/TrustKeyManager.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/ConfigurationUtil.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
Log:
JBID-175: JAXBContext created once
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -40,7 +40,7 @@
import org.jboss.identity.federation.api.wstrust.WSTrustException;
import org.jboss.identity.federation.api.wstrust.WSTrustJAXBFactory;
import org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler;
-import org.jboss.identity.federation.web.config.STSType;
+import org.jboss.identity.federation.core.config.STSType;
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.exceptions.ParsingException;
import org.jboss.identity.federation.core.util.JAXBUtil;
@@ -188,7 +188,7 @@
try
{
- String pkgName = "org.jboss.identity.federation.web.config";
+ String pkgName = "org.jboss.identity.federation.core.config";
InputStream stream = configurationFile.openStream();
JAXBElement<STSType> element = (JAXBElement<STSType>)
JAXBUtil.getUnmarshaller(pkgName).unmarshal(stream);
STSType stsConfig = element.getValue();
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -30,12 +30,12 @@
import org.jboss.identity.federation.api.wstrust.SecurityTokenProvider;
import org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler;
import org.jboss.identity.federation.api.wstrust.WSTrustServiceFactory;
-import org.jboss.identity.federation.web.config.KeyProviderType;
-import org.jboss.identity.federation.web.config.STSType;
-import org.jboss.identity.federation.web.config.ServiceProviderType;
-import org.jboss.identity.federation.web.config.ServiceProvidersType;
-import org.jboss.identity.federation.web.config.TokenProviderType;
-import org.jboss.identity.federation.web.config.TokenProvidersType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.STSType;
+import org.jboss.identity.federation.core.config.ServiceProviderType;
+import org.jboss.identity.federation.core.config.ServiceProvidersType;
+import org.jboss.identity.federation.core.config.TokenProviderType;
+import org.jboss.identity.federation.core.config.TokenProvidersType;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
/**
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -48,10 +48,10 @@
import org.jboss.identity.federation.saml.v2.metadata.EntityDescriptorType;
import org.jboss.identity.federation.saml.v2.metadata.KeyDescriptorType;
import org.jboss.identity.federation.saml.v2.metadata.RoleDescriptorType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
-import org.jboss.identity.federation.web.config.KeyValueType;
-import org.jboss.identity.federation.web.config.MetadataProviderType;
-import org.jboss.identity.federation.web.config.ProviderType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.KeyValueType;
+import org.jboss.identity.federation.core.config.MetadataProviderType;
+import org.jboss.identity.federation.core.config.ProviderType;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.util.ConfigurationUtil;
import org.jboss.identity.xmlsec.w3.xmldsig.KeyInfoType;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -39,8 +39,8 @@
import javax.crypto.SecretKey;
import org.apache.log4j.Logger;
-import org.jboss.identity.federation.web.config.AuthPropertyType;
-import org.jboss.identity.federation.web.config.KeyValueType;
+import org.jboss.identity.federation.core.config.AuthPropertyType;
+import org.jboss.identity.federation.core.config.KeyValueType;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.interfaces.TrustKeyProcessingException;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -61,8 +61,8 @@
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.TrustType;
import org.jboss.identity.federation.web.interfaces.RoleGenerator;
import org.jboss.identity.federation.web.util.ConfigurationUtil;
import org.jboss.identity.federation.web.util.HTTPRedirectUtil;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -42,8 +42,8 @@
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
-import org.jboss.identity.federation.web.config.EncryptionType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.EncryptionType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.interfaces.TrustKeyProcessingException;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -49,8 +49,8 @@
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.web.interfaces.RoleGenerator;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -29,7 +29,7 @@
import org.apache.catalina.authenticator.FormAuthenticator;
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
-import org.jboss.identity.federation.web.config.SPType;
+import org.jboss.identity.federation.core.config.SPType;
import org.jboss.identity.federation.web.util.ConfigurationUtil;
/**
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -44,7 +44,7 @@
import org.jboss.identity.federation.api.saml.v2.common.SAMLDocumentHolder;
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.TrustType;
import
org.jboss.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext;
import org.jboss.identity.federation.web.util.PostBindingUtil;
import org.jboss.identity.federation.bindings.util.ValveUtil;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -38,7 +38,7 @@
import org.jboss.identity.federation.api.saml.v2.common.SAMLDocumentHolder;
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.util.XMLSignatureUtil;
-import org.jboss.identity.federation.web.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.interfaces.TrustKeyProcessingException;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -44,7 +44,7 @@
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
import org.jboss.identity.federation.api.util.Base64;
import org.jboss.identity.federation.api.util.DeflateUtil;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.TrustType;
import
org.jboss.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext;
import org.jboss.identity.federation.web.util.HTTPRedirectUtil;
import org.jboss.identity.federation.web.util.RedirectBindingUtil;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -35,7 +35,7 @@
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
-import org.jboss.identity.federation.web.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.interfaces.TrustKeyProcessingException;
Modified:
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -29,17 +29,17 @@
import junit.framework.TestCase;
-import org.jboss.identity.federation.web.config.AuthPropertyType;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
-import org.jboss.identity.federation.web.config.KeyValueType;
-import org.jboss.identity.federation.web.config.SPType;
-import org.jboss.identity.federation.web.config.STSType;
-import org.jboss.identity.federation.web.config.ServiceProviderType;
-import org.jboss.identity.federation.web.config.ServiceProvidersType;
-import org.jboss.identity.federation.web.config.TokenProviderType;
-import org.jboss.identity.federation.web.config.TokenProvidersType;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.AuthPropertyType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.KeyValueType;
+import org.jboss.identity.federation.core.config.SPType;
+import org.jboss.identity.federation.core.config.STSType;
+import org.jboss.identity.federation.core.config.ServiceProviderType;
+import org.jboss.identity.federation.core.config.ServiceProvidersType;
+import org.jboss.identity.federation.core.config.TokenProviderType;
+import org.jboss.identity.federation.core.config.TokenProvidersType;
+import org.jboss.identity.federation.core.config.TrustType;
import org.jboss.identity.federation.core.util.JAXBUtil;
/**
@@ -174,7 +174,7 @@
InputStream is = tcl.getResourceAsStream(configFile);
assertNotNull("Inputstream not null", is);
- Unmarshaller un =
JAXBUtil.getValidatingUnmarshaller("org.jboss.identity.federation.web.config",
+ Unmarshaller un =
JAXBUtil.getValidatingUnmarshaller("org.jboss.identity.federation.core.config",
schema);
return un.unmarshal(is);
}
Modified:
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -29,10 +29,10 @@
import junit.framework.TestCase;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.KeyValueType;
-import org.jboss.identity.federation.web.config.MetadataProviderType;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.KeyValueType;
+import org.jboss.identity.federation.core.config.MetadataProviderType;
+import org.jboss.identity.federation.core.config.TrustType;
import org.jboss.identity.federation.core.util.JAXBUtil;
@@ -81,7 +81,7 @@
assertNotNull("Inputstream not null", is);
Unmarshaller un =
-
JAXBUtil.getValidatingUnmarshaller("org.jboss.identity.federation.web.config",
+
JAXBUtil.getValidatingUnmarshaller("org.jboss.identity.federation.core.config",
schema);
return un.unmarshal(is);
}
Modified:
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -92,13 +92,12 @@
@Override
protected void setUp() throws Exception
{
+ super.setUp();
// for testing purposes we can instantiate the TestSTS as a regular POJO.
this.tokenService = new TestSTS();
TestContext context = new TestContext();
context.setUserPrincipal(new JBossIdentityPrincipal("sguilhen"));
this.tokenService.setContext(context);
-
- super.setUp();
}
/**
Modified:
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -25,6 +25,8 @@
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
@@ -146,48 +148,59 @@
*
* @see
org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext)
*/
+ @SuppressWarnings("unchecked")
public void validateToken(WSTrustRequestContext context) throws WSTrustException
{
// get the SAML assertion that must be validated.
ValidateTargetType validateTarget =
context.getRequestSecurityToken().getValidateTarget();
if(validateTarget == null)
throw new WSTrustException("Invalid validate message: missing required
ValidateTarget");
- Element assertionElement = (Element) validateTarget.getAny();
- String code = WSTrustConstants.STATUS_CODE_VALID;
- String reason = "SAMLV2.0 Assertion successfuly validated";
+ AssertionType assertion = null;
- if(!this.isAssertion(assertionElement))
+ Object assertionObj = validateTarget.getAny();
+ if(assertionObj instanceof JAXBElement)
{
- code = WSTrustConstants.STATUS_CODE_INVALID;
- reason = "Validation failure: supplied token is not a SAMLV2.0
Assertion";
+ JAXBElement<AssertionType> assertionType =
(JAXBElement<AssertionType>) validateTarget.getAny();
+ assertion = assertionType.getValue();
}
- else
+ else if(assertionObj instanceof Element)
{
- // check the assertion lifetime.
try
{
- AssertionType assertion = SAMLUtil.fromElement(assertionElement);
- if(AssertionUtil.hasExpired(assertion))
- {
- code = WSTrustConstants.STATUS_CODE_INVALID;
- reason = "Validation failure: assertion expired or used before its
lifetime period";
- }
+ assertion = SAMLUtil.fromElement((Element) assertionObj);
}
- catch(Exception ce)
+ catch (JAXBException e)
{
+ throw new RuntimeException(e);
+ }
+ }
+
+ String code = WSTrustConstants.STATUS_CODE_VALID;
+ String reason = "SAMLV2.0 Assertion successfuly validated";
+
+ // check the assertion lifetime.
+ try
+ {
+ if(AssertionUtil.hasExpired(assertion))
+ {
code = WSTrustConstants.STATUS_CODE_INVALID;
- reason = "Validation failure: unable to verify assertion lifetime:
" + ce.getMessage();
+ reason = "Validation failure: assertion expired or used before its
lifetime period";
}
}
-
+ catch(Exception ce)
+ {
+ code = WSTrustConstants.STATUS_CODE_INVALID;
+ reason = "Validation failure: unable to verify assertion lifetime: " +
ce.getMessage();
+ }
+
// construct the status and set it on the request context.
StatusType status = new StatusType();
status.setCode(code);
status.setReason(reason);
context.setStatus(status);
}
-
+
/**
* <p>
* Checks whether the specified element is a SAMLV2.0 assertion or not.
@@ -201,4 +214,4 @@
return element == null ? false :
"Assertion".equals(element.getLocalName())
&&
WSTrustConstants.SAML2_ASSERTION_NS.equals(element.getNamespaceURI());
}
-}
+}
\ No newline at end of file
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for AuthPropertyType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="AuthPropertyType">
+ * <complexContent>
+ * <extension
base="{urn:jboss:identity-federation:config:1.0}KeyValueType">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AuthPropertyType")
+public class AuthPropertyType
+ extends KeyValueType
+{
+
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,59 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for EncAlgoType.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ * <p>
+ * <pre>
+ * <simpleType name="EncAlgoType">
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="AES"/>
+ * <enumeration value="DES"/>
+ * <enumeration value="DESede"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ *
+ */
+@XmlType(name = "EncAlgoType")
+@XmlEnum
+public enum EncAlgoType {
+
+ AES("AES"),
+ DES("DES"),
+ @XmlEnumValue("DESede")
+ DE_SEDE("DESede");
+ private final String value;
+
+ EncAlgoType(String v) {
+ value = v;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ public static EncAlgoType fromValue(String v) {
+ for (EncAlgoType c: EncAlgoType.values()) {
+ if (c.value.equals(v)) {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,89 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for EncryptionType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="EncryptionType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="EncAlgo"
type="{urn:jboss:identity-federation:config:1.0}EncAlgoType"/>
+ * <element name="KeySize"
type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EncryptionType", propOrder = {
+ "encAlgo",
+ "keySize"
+})
+public class EncryptionType {
+
+ @XmlElement(name = "EncAlgo", required = true)
+ protected EncAlgoType encAlgo;
+ @XmlElement(name = "KeySize")
+ protected int keySize;
+
+ /**
+ * Gets the value of the encAlgo property.
+ *
+ * @return
+ * possible object is
+ * {@link EncAlgoType }
+ *
+ */
+ public EncAlgoType getEncAlgo() {
+ return encAlgo;
+ }
+
+ /**
+ * Sets the value of the encAlgo property.
+ *
+ * @param value
+ * allowed object is
+ * {@link EncAlgoType }
+ *
+ */
+ public void setEncAlgo(EncAlgoType value) {
+ this.encAlgo = value;
+ }
+
+ /**
+ * Gets the value of the keySize property.
+ *
+ */
+ public int getKeySize() {
+ return keySize;
+ }
+
+ /**
+ * Sets the value of the keySize property.
+ *
+ */
+ public void setKeySize(int value) {
+ this.keySize = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,170 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * IDP Type defines the configuration for an Identity
+ * Provider.
+ *
+ *
+ * <p>Java class for IDPType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="IDPType">
+ * <complexContent>
+ * <extension
base="{urn:jboss:identity-federation:config:1.0}ProviderType">
+ * <sequence>
+ * <element name="Encryption"
type="{urn:jboss:identity-federation:config:1.0}EncryptionType"
minOccurs="0"/>
+ * </sequence>
+ * <attribute name="AssertionValidity"
type="{http://www.w3.org/2001/XMLSchema}long" default="300000" />
+ * <attribute name="RoleGenerator"
type="{http://www.w3.org/2001/XMLSchema}string"
default="org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator"
/>
+ * <attribute name="Encrypt"
type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
/>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IDPType", propOrder = {
+ "encryption"
+})
+public class IDPType
+ extends ProviderType
+{
+
+ @XmlElement(name = "Encryption")
+ protected EncryptionType encryption;
+ @XmlAttribute(name = "AssertionValidity")
+ protected Long assertionValidity;
+ @XmlAttribute(name = "RoleGenerator")
+ protected String roleGenerator;
+ @XmlAttribute(name = "Encrypt")
+ protected Boolean encrypt;
+
+ /**
+ * Gets the value of the encryption property.
+ *
+ * @return
+ * possible object is
+ * {@link EncryptionType }
+ *
+ */
+ public EncryptionType getEncryption() {
+ return encryption;
+ }
+
+ /**
+ * Sets the value of the encryption property.
+ *
+ * @param value
+ * allowed object is
+ * {@link EncryptionType }
+ *
+ */
+ public void setEncryption(EncryptionType value) {
+ this.encryption = value;
+ }
+
+ /**
+ * Gets the value of the assertionValidity property.
+ *
+ * @return
+ * possible object is
+ * {@link Long }
+ *
+ */
+ public long getAssertionValidity() {
+ if (assertionValidity == null) {
+ return 300000L;
+ } else {
+ return assertionValidity;
+ }
+ }
+
+ /**
+ * Sets the value of the assertionValidity property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Long }
+ *
+ */
+ public void setAssertionValidity(Long value) {
+ this.assertionValidity = value;
+ }
+
+ /**
+ * Gets the value of the roleGenerator property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRoleGenerator() {
+ if (roleGenerator == null) {
+ return
"org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator";
+ } else {
+ return roleGenerator;
+ }
+ }
+
+ /**
+ * Sets the value of the roleGenerator property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRoleGenerator(String value) {
+ this.roleGenerator = value;
+ }
+
+ /**
+ * Gets the value of the encrypt property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isEncrypt() {
+ if (encrypt == null) {
+ return false;
+ } else {
+ return encrypt;
+ }
+ }
+
+ /**
+ * Sets the value of the encrypt property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setEncrypt(Boolean value) {
+ this.encrypt = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,170 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * Source of the Signing and Validating Key
+ *
+ *
+ * <p>Java class for KeyProviderType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="KeyProviderType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="Auth"
type="{urn:jboss:identity-federation:config:1.0}AuthPropertyType"
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="ValidatingAlias"
type="{urn:jboss:identity-federation:config:1.0}KeyValueType"
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="SigningAlias"
type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="ClassName"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "KeyProviderType", propOrder = {
+ "auth",
+ "validatingAlias",
+ "signingAlias"
+})
+public class KeyProviderType {
+
+ @XmlElement(name = "Auth")
+ protected List<AuthPropertyType> auth;
+ @XmlElement(name = "ValidatingAlias")
+ protected List<KeyValueType> validatingAlias;
+ @XmlElement(name = "SigningAlias")
+ protected String signingAlias;
+ @XmlAttribute(name = "ClassName")
+ protected String className;
+
+ /**
+ * Gets the value of the auth property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the auth
property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAuth().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link AuthPropertyType }
+ *
+ *
+ */
+ public List<AuthPropertyType> getAuth() {
+ if (auth == null) {
+ auth = new ArrayList<AuthPropertyType>();
+ }
+ return this.auth;
+ }
+
+ /**
+ * Gets the value of the validatingAlias property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the
validatingAlias property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getValidatingAlias().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link KeyValueType }
+ *
+ *
+ */
+ public List<KeyValueType> getValidatingAlias() {
+ if (validatingAlias == null) {
+ validatingAlias = new ArrayList<KeyValueType>();
+ }
+ return this.validatingAlias;
+ }
+
+ /**
+ * Gets the value of the signingAlias property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSigningAlias() {
+ return signingAlias;
+ }
+
+ /**
+ * Sets the value of the signingAlias property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSigningAlias(String value) {
+ this.signingAlias = value;
+ }
+
+ /**
+ * Gets the value of the className property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * Sets the value of the className property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setClassName(String value) {
+ this.className = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,96 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for KeyValueType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="KeyValueType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="Key"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="Value"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "KeyValueType")
+@XmlSeeAlso({
+ AuthPropertyType.class
+})
+public class KeyValueType {
+
+ @XmlAttribute(name = "Key")
+ protected String key;
+ @XmlAttribute(name = "Value")
+ protected String value;
+
+ /**
+ * Gets the value of the key property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getKey() {
+ return key;
+ }
+
+ /**
+ * Sets the value of the key property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setKey(String value) {
+ this.key = value;
+ }
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,105 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.22 at 01:16:08 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MetadataProviderType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="MetadataProviderType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="Option"
type="{urn:jboss:identity-federation:config:1.0}KeyValueType"
maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="ClassName"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MetadataProviderType", propOrder = {
+ "option"
+})
+public class MetadataProviderType {
+
+ @XmlElement(name = "Option")
+ protected List<KeyValueType> option;
+ @XmlAttribute(name = "ClassName")
+ protected String className;
+
+ /**
+ * Gets the value of the option property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the option
property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getOption().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link KeyValueType }
+ *
+ *
+ */
+ public List<KeyValueType> getOption() {
+ if (option == null) {
+ option = new ArrayList<KeyValueType>();
+ }
+ return this.option;
+ }
+
+ /**
+ * Gets the value of the className property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * Sets the value of the className property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setClassName(String value) {
+ this.className = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,184 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.identity.federation.core.config package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _JBossSTS_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossSTS");
+ private final static QName _JBossIDP_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossIDP");
+ private final static QName _JBossSP_QNAME = new
QName("urn:jboss:identity-federation:config:1.0", "JBossSP");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema
derived classes for package: org.jboss.identity.federation.core.config
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link STSType }
+ *
+ */
+ public STSType createSTSType() {
+ return new STSType();
+ }
+
+ /**
+ * Create an instance of {@link KeyValueType }
+ *
+ */
+ public KeyValueType createKeyValueType() {
+ return new KeyValueType();
+ }
+
+ /**
+ * Create an instance of {@link ServiceProviderType }
+ *
+ */
+ public ServiceProviderType createServiceProviderType() {
+ return new ServiceProviderType();
+ }
+
+ /**
+ * Create an instance of {@link KeyProviderType }
+ *
+ */
+ public KeyProviderType createKeyProviderType() {
+ return new KeyProviderType();
+ }
+
+ /**
+ * Create an instance of {@link TokenProvidersType }
+ *
+ */
+ public TokenProvidersType createTokenProvidersType() {
+ return new TokenProvidersType();
+ }
+
+ /**
+ * Create an instance of {@link TokenProviderType }
+ *
+ */
+ public TokenProviderType createTokenProviderType() {
+ return new TokenProviderType();
+ }
+
+ /**
+ * Create an instance of {@link IDPType }
+ *
+ */
+ public IDPType createIDPType() {
+ return new IDPType();
+ }
+
+ /**
+ * Create an instance of {@link ServiceProvidersType }
+ *
+ */
+ public ServiceProvidersType createServiceProvidersType() {
+ return new ServiceProvidersType();
+ }
+
+ /**
+ * Create an instance of {@link MetadataProviderType }
+ *
+ */
+ public MetadataProviderType createMetadataProviderType() {
+ return new MetadataProviderType();
+ }
+
+ /**
+ * Create an instance of {@link ProviderType }
+ *
+ */
+ public ProviderType createProviderType() {
+ return new ProviderType();
+ }
+
+ /**
+ * Create an instance of {@link AuthPropertyType }
+ *
+ */
+ public AuthPropertyType createAuthPropertyType() {
+ return new AuthPropertyType();
+ }
+
+ /**
+ * Create an instance of {@link TrustType }
+ *
+ */
+ public TrustType createTrustType() {
+ return new TrustType();
+ }
+
+ /**
+ * Create an instance of {@link SPType }
+ *
+ */
+ public SPType createSPType() {
+ return new SPType();
+ }
+
+ /**
+ * Create an instance of {@link EncryptionType }
+ *
+ */
+ public EncryptionType createEncryptionType() {
+ return new EncryptionType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link STSType }{@code
>}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0",
name = "JBossSTS")
+ public JAXBElement<STSType> createJBossSTS(STSType value) {
+ return new JAXBElement<STSType>(_JBossSTS_QNAME, STSType.class, null,
value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code
>}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0",
name = "JBossIDP")
+ public JAXBElement<IDPType> createJBossIDP(IDPType value) {
+ return new JAXBElement<IDPType>(_JBossIDP_QNAME, IDPType.class, null,
value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link SPType }{@code
>}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0",
name = "JBossSP")
+ public JAXBElement<SPType> createJBossSP(SPType value) {
+ return new JAXBElement<SPType>(_JBossSP_QNAME, SPType.class, null, value);
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,199 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Base Type for IDP and SP
+ *
+ * <p>Java class for ProviderType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="ProviderType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="IdentityURL"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="Trust"
type="{urn:jboss:identity-federation:config:1.0}TrustType"
minOccurs="0"/>
+ * <element name="KeyProvider"
type="{urn:jboss:identity-federation:config:1.0}KeyProviderType"
minOccurs="0"/>
+ * <element name="MetaDataProvider"
type="{urn:jboss:identity-federation:config:1.0}MetadataProviderType"
minOccurs="0"/>
+ * </sequence>
+ * <attribute name="ServerEnvironment"
default="JBOSS">
+ * <simpleType>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="JBOSS"/>
+ * <enumeration value="TOMCAT"/>
+ * </restriction>
+ * </simpleType>
+ * </attribute>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProviderType", propOrder = {
+ "identityURL",
+ "trust",
+ "keyProvider",
+ "metaDataProvider"
+})
+@XmlSeeAlso({
+ IDPType.class,
+ SPType.class
+})
+public class ProviderType {
+
+ @XmlElement(name = "IdentityURL", required = true)
+ protected String identityURL;
+ @XmlElement(name = "Trust")
+ protected TrustType trust;
+ @XmlElement(name = "KeyProvider")
+ protected KeyProviderType keyProvider;
+ @XmlElement(name = "MetaDataProvider")
+ protected MetadataProviderType metaDataProvider;
+ @XmlAttribute(name = "ServerEnvironment")
+ protected String serverEnvironment;
+
+ /**
+ * Gets the value of the identityURL property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getIdentityURL() {
+ return identityURL;
+ }
+
+ /**
+ * Sets the value of the identityURL property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setIdentityURL(String value) {
+ this.identityURL = value;
+ }
+
+ /**
+ * Gets the value of the trust property.
+ *
+ * @return
+ * possible object is
+ * {@link TrustType }
+ *
+ */
+ public TrustType getTrust() {
+ return trust;
+ }
+
+ /**
+ * Sets the value of the trust property.
+ *
+ * @param value
+ * allowed object is
+ * {@link TrustType }
+ *
+ */
+ public void setTrust(TrustType value) {
+ this.trust = value;
+ }
+
+ /**
+ * Gets the value of the keyProvider property.
+ *
+ * @return
+ * possible object is
+ * {@link KeyProviderType }
+ *
+ */
+ public KeyProviderType getKeyProvider() {
+ return keyProvider;
+ }
+
+ /**
+ * Sets the value of the keyProvider property.
+ *
+ * @param value
+ * allowed object is
+ * {@link KeyProviderType }
+ *
+ */
+ public void setKeyProvider(KeyProviderType value) {
+ this.keyProvider = value;
+ }
+
+ /**
+ * Gets the value of the metaDataProvider property.
+ *
+ * @return
+ * possible object is
+ * {@link MetadataProviderType }
+ *
+ */
+ public MetadataProviderType getMetaDataProvider() {
+ return metaDataProvider;
+ }
+
+ /**
+ * Sets the value of the metaDataProvider property.
+ *
+ * @param value
+ * allowed object is
+ * {@link MetadataProviderType }
+ *
+ */
+ public void setMetaDataProvider(MetadataProviderType value) {
+ this.metaDataProvider = value;
+ }
+
+ /**
+ * Gets the value of the serverEnvironment property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getServerEnvironment() {
+ if (serverEnvironment == null) {
+ return "JBOSS";
+ } else {
+ return serverEnvironment;
+ }
+ }
+
+ /**
+ * Sets the value of the serverEnvironment property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setServerEnvironment(String value) {
+ this.serverEnvironment = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,73 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Service Provider Type
+ *
+ * <p>Java class for SPType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="SPType">
+ * <complexContent>
+ * <extension
base="{urn:jboss:identity-federation:config:1.0}ProviderType">
+ * <sequence>
+ * <element name="ServiceURL"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SPType", propOrder = {
+ "serviceURL"
+})
+public class SPType
+ extends ProviderType
+{
+
+ @XmlElement(name = "ServiceURL", required = true)
+ protected String serviceURL;
+
+ /**
+ * Gets the value of the serviceURL property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getServiceURL() {
+ return serviceURL;
+ }
+
+ /**
+ * Sets the value of the serviceURL property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setServiceURL(String value) {
+ this.serviceURL = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,247 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for STSType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="STSType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="KeyProvider"
type="{urn:jboss:identity-federation:config:1.0}KeyProviderType"
minOccurs="0"/>
+ * <element name="RequestHandler"
type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element name="TokenProviders"
type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType"
minOccurs="0"/>
+ * <element name="ServiceProviders"
type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType"
minOccurs="0"/>
+ * </sequence>
+ * <attribute name="STSName"
type="{http://www.w3.org/2001/XMLSchema}string" default="JBossSTS"
/>
+ * <attribute name="TokenTimeout"
type="{http://www.w3.org/2001/XMLSchema}int" default="3600" />
+ * <attribute name="EncryptToken"
type="{http://www.w3.org/2001/XMLSchema}boolean" default="false"
/>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "STSType", propOrder = {
+ "keyProvider",
+ "requestHandler",
+ "tokenProviders",
+ "serviceProviders"
+})
+public class STSType {
+
+ @XmlElement(name = "KeyProvider")
+ protected KeyProviderType keyProvider;
+ @XmlElement(name = "RequestHandler")
+ protected String requestHandler;
+ @XmlElement(name = "TokenProviders")
+ protected TokenProvidersType tokenProviders;
+ @XmlElement(name = "ServiceProviders")
+ protected ServiceProvidersType serviceProviders;
+ @XmlAttribute(name = "STSName")
+ protected String stsName;
+ @XmlAttribute(name = "TokenTimeout")
+ protected Integer tokenTimeout;
+ @XmlAttribute(name = "EncryptToken")
+ protected Boolean encryptToken;
+
+ /**
+ * Gets the value of the keyProvider property.
+ *
+ * @return
+ * possible object is
+ * {@link KeyProviderType }
+ *
+ */
+ public KeyProviderType getKeyProvider() {
+ return keyProvider;
+ }
+
+ /**
+ * Sets the value of the keyProvider property.
+ *
+ * @param value
+ * allowed object is
+ * {@link KeyProviderType }
+ *
+ */
+ public void setKeyProvider(KeyProviderType value) {
+ this.keyProvider = value;
+ }
+
+ /**
+ * Gets the value of the requestHandler property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRequestHandler() {
+ return requestHandler;
+ }
+
+ /**
+ * Sets the value of the requestHandler property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRequestHandler(String value) {
+ this.requestHandler = value;
+ }
+
+ /**
+ * Gets the value of the tokenProviders property.
+ *
+ * @return
+ * possible object is
+ * {@link TokenProvidersType }
+ *
+ */
+ public TokenProvidersType getTokenProviders() {
+ return tokenProviders;
+ }
+
+ /**
+ * Sets the value of the tokenProviders property.
+ *
+ * @param value
+ * allowed object is
+ * {@link TokenProvidersType }
+ *
+ */
+ public void setTokenProviders(TokenProvidersType value) {
+ this.tokenProviders = value;
+ }
+
+ /**
+ * Gets the value of the serviceProviders property.
+ *
+ * @return
+ * possible object is
+ * {@link ServiceProvidersType }
+ *
+ */
+ public ServiceProvidersType getServiceProviders() {
+ return serviceProviders;
+ }
+
+ /**
+ * Sets the value of the serviceProviders property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ServiceProvidersType }
+ *
+ */
+ public void setServiceProviders(ServiceProvidersType value) {
+ this.serviceProviders = value;
+ }
+
+ /**
+ * Gets the value of the stsName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSTSName() {
+ if (stsName == null) {
+ return "JBossSTS";
+ } else {
+ return stsName;
+ }
+ }
+
+ /**
+ * Sets the value of the stsName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSTSName(String value) {
+ this.stsName = value;
+ }
+
+ /**
+ * Gets the value of the tokenTimeout property.
+ *
+ * @return
+ * possible object is
+ * {@link Integer }
+ *
+ */
+ public int getTokenTimeout() {
+ if (tokenTimeout == null) {
+ return 3600;
+ } else {
+ return tokenTimeout;
+ }
+ }
+
+ /**
+ * Sets the value of the tokenTimeout property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Integer }
+ *
+ */
+ public void setTokenTimeout(Integer value) {
+ this.tokenTimeout = value;
+ }
+
+ /**
+ * Gets the value of the encryptToken property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isEncryptToken() {
+ if (encryptToken == null) {
+ return false;
+ } else {
+ return encryptToken;
+ }
+ }
+
+ /**
+ * Sets the value of the encryptToken property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setEncryptToken(Boolean value) {
+ this.encryptToken = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,126 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * The service provider type contains information about a specific service provider.
In particular,
+ * it specifies the type of the token that must be issued for the provider and the
alias of the
+ * provider's PKC in the truststore. This is used by the STS to locate the PKC
when encrypting the
+ * generated token.
+ *
+ *
+ * <p>Java class for ServiceProviderType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="ServiceProviderType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="endpoint" use="required"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="TruststoreAlias" use="required"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="TokenType" use="required"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceProviderType")
+public class ServiceProviderType {
+
+ @XmlAttribute(name = "Endpoint", required = true)
+ protected String endpoint;
+ @XmlAttribute(name = "TruststoreAlias", required = true)
+ protected String truststoreAlias;
+ @XmlAttribute(name = "TokenType", required = true)
+ protected String tokenType;
+
+ /**
+ * Gets the value of the endpoint property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getEndpoint() {
+ return endpoint;
+ }
+
+ /**
+ * Sets the value of the endpoint property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setEndpoint(String value) {
+ this.endpoint = value;
+ }
+
+ /**
+ * Gets the value of the truststoreAlias property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTruststoreAlias() {
+ return truststoreAlias;
+ }
+
+ /**
+ * Sets the value of the truststoreAlias property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTruststoreAlias(String value) {
+ this.truststoreAlias = value;
+ }
+
+ /**
+ * Gets the value of the tokenType property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTokenType() {
+ return tokenType;
+ }
+
+ /**
+ * Sets the value of the tokenType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTokenType(String value) {
+ this.tokenType = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,81 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * The service providers specify the token type expected by each service provider.
+ *
+ *
+ * <p>Java class for ServiceProvidersType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="ServiceProvidersType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="ServiceProvider"
type="{urn:jboss:identity-federation:config:1.0}ServiceProviderType"
maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceProvidersType", propOrder = {
+ "serviceProvider"
+})
+public class ServiceProvidersType {
+
+ @XmlElement(name = "ServiceProvider", required = true)
+ protected List<ServiceProviderType> serviceProvider;
+
+ /**
+ * Gets the value of the serviceProvider property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the
serviceProvider property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getServiceProvider().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link ServiceProviderType }
+ *
+ *
+ */
+ public List<ServiceProviderType> getServiceProvider() {
+ if (serviceProvider == null) {
+ serviceProvider = new ArrayList<ServiceProviderType>();
+ }
+ return this.serviceProvider;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,92 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TokenProviderType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="TokenProviderType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="ProviderClass" use="required"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="TokenType" use="required"
type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TokenProviderType")
+public class TokenProviderType {
+
+ @XmlAttribute(name = "ProviderClass", required = true)
+ protected String providerClass;
+ @XmlAttribute(name = "TokenType", required = true)
+ protected String tokenType;
+
+ /**
+ * Gets the value of the providerClass property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getProviderClass() {
+ return providerClass;
+ }
+
+ /**
+ * Sets the value of the providerClass property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setProviderClass(String value) {
+ this.providerClass = value;
+ }
+
+ /**
+ * Gets the value of the tokenType property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTokenType() {
+ return tokenType;
+ }
+
+ /**
+ * Sets the value of the tokenType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTokenType(String value) {
+ this.tokenType = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,83 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * The token providers specify the classes that handle the requests for each type of
security Token.
+ * For example, a SAMLTokenProvider may be used to generate SAML token, while a
X509TokenProvider
+ * may be used to generate X.509 tokens (certificates).
+ *
+ *
+ * <p>Java class for TokenProvidersType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="TokenProvidersType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="TokenProvider"
type="{urn:jboss:identity-federation:config:1.0}TokenProviderType"
maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TokenProvidersType", propOrder = {
+ "tokenProvider"
+})
+public class TokenProvidersType {
+
+ @XmlElement(name = "TokenProvider", required = true)
+ protected List<TokenProviderType> tokenProvider;
+
+ /**
+ * Gets the value of the tokenProvider property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the
tokenProvider property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getTokenProvider().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link TokenProviderType }
+ *
+ *
+ */
+ public List<TokenProviderType> getTokenProvider() {
+ if (tokenProvider == null) {
+ tokenProvider = new ArrayList<TokenProviderType>();
+ }
+ return this.tokenProvider;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,71 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+
+package org.jboss.identity.federation.core.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Aspects involved in trust decisions such as the domains that the IDP or the Service
Provider trusts.
+ *
+ * <p>Java class for TrustType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within
this class.
+ *
+ * <pre>
+ * <complexType name="TrustType">
+ * <complexContent>
+ * <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="Domains"
type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TrustType", propOrder = {
+ "domains"
+})
+public class TrustType {
+
+ @XmlElement(name = "Domains", required = true)
+ protected String domains;
+
+ /**
+ * Gets the value of the domains property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDomains() {
+ return domains;
+ }
+
+ /**
+ * Sets the value of the domains property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDomains(String value) {
+ this.domains = value;
+ }
+
+}
Added:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java
(rev 0)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
Implementation, vhudson-jaxb-ri-2.1-661
+// See <a
href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/...
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.04.21 at 04:51:39 PM CDT
+//
+
+(a)javax.xml.bind.annotation.XmlSchema(namespace =
"urn:jboss:identity-federation:config:1.0", elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.jboss.identity.federation.core.config;
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -22,7 +22,6 @@
package org.jboss.identity.federation.core.util;
import java.net.URL;
-import java.util.HashMap;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -43,15 +42,23 @@
*/
public class JAXBUtil
{
+ public static final JAXBContext jaxbContext;
private static Logger log = Logger.getLogger(JAXBUtil.class);
private static boolean trace = log.isTraceEnabled();
public static final String W3C_XML_SCHEMA_NS_URI =
"http://www.w3.org/2001/XMLSchema";
-
- private static HashMap<String,JAXBContext> jaxbContextHash = new
HashMap<String, JAXBContext>();
-
+
static
{
+ try
+ {
+ jaxbContext = JAXBContext.newInstance(getPackages());
+ }
+ catch (JAXBException e)
+ {
+ throw new RuntimeException(e);
+ }
+
//Useful on Sun VMs. Harmless on other VMs.
SecurityActions.setSystemProperty("com.sun.xml.bind.v2.runtime.JAXBContextImpl.fastBoot",
"true");
}
@@ -87,8 +94,7 @@
if(pkgName == null)
throw new IllegalArgumentException("pkgName is null");
- JAXBContext jc = getJAXBContext(pkgName);
- Marshaller marshaller = jc.createMarshaller();
+ Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.FALSE); //Breaks
signatures
return marshaller;
@@ -104,8 +110,7 @@
{
if(pkgName == null)
throw new IllegalArgumentException("pkgName is null");
- JAXBContext jc = getJAXBContext(pkgName);
- return jc.createUnmarshaller();
+ return jaxbContext.createUnmarshaller();
}
/**
@@ -182,25 +187,46 @@
public static JAXBContext getJAXBContext(String path) throws JAXBException
{
- JAXBContext jx = jaxbContextHash.get(path);
- if(jx == null)
- {
- jx = JAXBContext.newInstance(path);
- jaxbContextHash.put(path, jx);
- }
- return jx;
+ return jaxbContext;
}
public static JAXBContext getJAXBContext(Class<?> clazz) throws JAXBException
{
- String clazzName = clazz.getName();
+ return jaxbContext;
+ }
+
+ private static String getPackages()
+ {
+ StringBuilder packages = new StringBuilder();
+ //SAML Related
+ packages.append("org.jboss.identity.federation.saml.v2.protocol");
+ packages.append(":org.jboss.identity.federation.saml.v2.metadata");
+ packages.append(":org.jboss.identity.federation.saml.v2.assertion");
- JAXBContext jx = jaxbContextHash.get(clazzName);
- if(jx == null)
- {
- jx = JAXBContext.newInstance(clazz);
- jaxbContextHash.put(clazzName, jx);
- }
- return jx;
+ //SOAP Related
+
packages.append(":org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope");
+
+ //XACML Related
+ packages.append(":org.jboss.security.xacml.core.model.context");
+
packages.append(":org.jboss.identity.federation.saml.v2.profiles.xacml.assertion");
+
packages.append(":org.jboss.identity.federation.saml.v2.profiles.xacml.protocol");
+
+ //WS-Trust Related
+ packages.append(":org.jboss.identity.federation.ws.addressing");
+ packages.append(":org.jboss.identity.federation.ws.policy");
+ packages.append(":org.jboss.identity.federation.ws.trust");
+ packages.append(":org.jboss.identity.federation.ws.wss.secext");
+ packages.append(":org.jboss.identity.federation.ws.wss.utility");
+
+ //XML DSIG
+ packages.append(":org.jboss.identity.xmlsec.w3.xmldsig");
+
+ //XML ENC
+ packages.append(":org.jboss.identity.xmlsec.w3.xmlenc");
+
+ //Config
+ packages.append(":org.jboss.identity.federation.core.config");
+
+ return packages.toString();
}
}
\ No newline at end of file
Modified:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java
===================================================================
---
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -72,9 +72,9 @@
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
import org.jboss.identity.federation.saml.v2.protocol.StatusType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
-import org.jboss.identity.federation.web.config.SPType;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.SPType;
+import org.jboss.identity.federation.core.config.TrustType;
import org.jboss.identity.federation.web.interfaces.IRoleValidator;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
Modified:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/interfaces/TrustKeyManager.java
===================================================================
---
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/interfaces/TrustKeyManager.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/interfaces/TrustKeyManager.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -29,8 +29,8 @@
import javax.crypto.SecretKey;
-import org.jboss.identity.federation.web.config.AuthPropertyType;
-import org.jboss.identity.federation.web.config.KeyValueType;
+import org.jboss.identity.federation.core.config.AuthPropertyType;
+import org.jboss.identity.federation.core.config.KeyValueType;
/**
Modified:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java
===================================================================
---
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -44,8 +44,8 @@
import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.KeyProviderType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.web.interfaces.RoleGenerator;
import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
Modified:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/ConfigurationUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/ConfigurationUtil.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/ConfigurationUtil.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -29,8 +29,8 @@
import org.jboss.identity.federation.core.constants.JBossIdentityFederationConstants;
import org.jboss.identity.federation.core.util.JAXBUtil;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.SPType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.SPType;
import org.xml.sax.SAXException;
/**
@@ -49,7 +49,7 @@
String key = JBossIdentityFederationConstants.JAXB_SCHEMA_VALIDATION;
boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key,
"false"));
- String pkgName = "org.jboss.identity.federation.web.config";
+ String pkgName = "org.jboss.identity.federation.core.config";
Unmarshaller un = null;
if(validate)
un = JAXBUtil.getValidatingUnmarshaller(pkgName, schema);
@@ -70,7 +70,7 @@
String key = JBossIdentityFederationConstants.JAXB_SCHEMA_VALIDATION;
boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key,
"false"));
- String pkgName = "org.jboss.identity.federation.web.config";
+ String pkgName = "org.jboss.identity.federation.core.config";
Unmarshaller un = null;
if(validate)
un = JAXBUtil.getValidatingUnmarshaller(pkgName, schema);
Modified:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-25
16:46:03 UTC (rev 738)
+++
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-25
16:51:29 UTC (rev 739)
@@ -44,8 +44,8 @@
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
import org.jboss.identity.federation.api.saml.v2.sig.SAML2Signature;
-import org.jboss.identity.federation.web.config.IDPType;
-import org.jboss.identity.federation.web.config.TrustType;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.TrustType;
import org.jboss.identity.federation.web.interfaces.TrustKeyManager;
import org.jboss.identity.federation.web.util.HTTPRedirectUtil;
import org.jboss.identity.federation.web.util.PostBindingUtil;