jboss-identity-commits
August 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 78 discussions
JBoss Identity SVN: r744 - in identity-federation/trunk: jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response and 3 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-26 00:11:02 -0400 (Wed, 26 Aug 2009)
New Revision: 744
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/factories/XACMLContextFactory.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
Log:
JBID-177: api work
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-25 20:22:41 UTC (rev 743)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-26 04:11:02 UTC (rev 744)
@@ -25,6 +25,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.security.PrivilegedActionException;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -41,17 +43,19 @@
import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
import org.jboss.identity.federation.core.factories.SOAPFactory;
-import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
+import org.jboss.identity.federation.core.factories.XACMLContextFactory;
import org.jboss.identity.federation.core.saml.v2.factories.SAMLAssertionFactory;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
import org.jboss.identity.federation.core.saml.v2.util.JAXBElementMappingUtil;
import org.jboss.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil;
+import org.jboss.identity.federation.core.saml.v2.util.XMLTimeUtil;
import org.jboss.identity.federation.core.util.JAXBUtil;
import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Body;
import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Envelope;
import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Fault;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
+import org.jboss.identity.federation.saml.v2.assertion.StatementAbstractType;
import org.jboss.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
import org.jboss.identity.federation.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
@@ -200,9 +204,8 @@
ResultType resultType = responseContext.getResult();
responseType.getResult().add(resultType);
- XACMLAuthzDecisionStatementType xacmlStatement = SOAPSAMLXACMLUtil.createXACMLAuthzDecisionStatementType();
- xacmlStatement.setRequest(requestType);
- xacmlStatement.setResponse(responseType);
+ XACMLAuthzDecisionStatementType xacmlStatement =
+ XACMLContextFactory.createXACMLAuthzDecisionStatementType(requestType, responseType);
//Place the xacml statement in an assertion
//Then the assertion goes inside a SAML Response
@@ -211,12 +214,16 @@
SAML2Response saml2Response = new SAML2Response();
IssuerInfoHolder issuerInfo = new IssuerInfoHolder(this.issuer);
- AssertionType assertion = SAMLAssertionFactory.getObjectFactory().createAssertionType();
- assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(xacmlStatement);
- assertion.setID(ID);
- assertion.setVersion(JBossSAMLConstants.VERSION_2_0.get());
- assertion.setIssuer(issuerInfo.getIssuer());
+ List<StatementAbstractType> statements = new ArrayList<StatementAbstractType>();
+ statements.add(xacmlStatement);
+ AssertionType assertion = SAMLAssertionFactory.createAssertion(ID,
+ issuerInfo.getIssuer(),
+ XMLTimeUtil.getIssueInstant(),
+ null,
+ null,
+ statements);
+
JAXBElement<?> jaxbResponse = JAXBElementMappingUtil.get(saml2Response.createResponseType(ID, issuerInfo, assertion));
//Create a SOAP Envelope to hold the SAML response
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-08-25 20:22:41 UTC (rev 743)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-08-26 04:11:02 UTC (rev 744)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
+import java.util.Arrays;
import java.util.List;
import javax.xml.bind.Binder;
@@ -53,12 +54,16 @@
import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
import org.jboss.identity.federation.core.saml.v2.util.JAXBElementMappingUtil;
import org.jboss.identity.federation.core.util.JAXBUtil;
+import org.jboss.identity.federation.saml.v2.assertion.ActionType;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
import org.jboss.identity.federation.saml.v2.assertion.AuthnContextType;
import org.jboss.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.jboss.identity.federation.saml.v2.assertion.AuthzDecisionStatementType;
+import org.jboss.identity.federation.saml.v2.assertion.DecisionType;
import org.jboss.identity.federation.saml.v2.assertion.EncryptedElementType;
+import org.jboss.identity.federation.saml.v2.assertion.EvidenceType;
import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
@@ -104,7 +109,36 @@
authnStatement.setAuthnContext(act);
return authnStatement;
}
+
/**
+ * Create an Authorization Decision Statement Type
+ * @param resource
+ * @param decision
+ * @param evidence
+ * @param actions
+ * @return
+ */
+ public AuthzDecisionStatementType createAuthzDecisionStatementType(String resource,
+ DecisionType decision,
+ EvidenceType evidence,
+ ActionType... actions)
+ {
+ ObjectFactory objectFactory = SAMLAssertionFactory.getObjectFactory();
+ AuthzDecisionStatementType authzDecST = objectFactory.createAuthzDecisionStatementType();
+ authzDecST.setResource(resource);
+ authzDecST.setDecision(decision);
+ if(evidence != null)
+ authzDecST.setEvidence(evidence);
+
+ if(actions != null)
+ {
+ authzDecST.getAction().addAll(Arrays.asList(actions));
+ }
+
+ return authzDecST;
+ }
+
+ /**
* Given a set of roles, create an attribute statement
* @param roles
* @return
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/factories/XACMLContextFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/factories/XACMLContextFactory.java 2009-08-25 20:22:41 UTC (rev 743)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/factories/XACMLContextFactory.java 2009-08-26 04:11:02 UTC (rev 744)
@@ -21,7 +21,11 @@
*/
package org.jboss.identity.federation.core.factories;
+import org.jboss.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil;
+import org.jboss.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
import org.jboss.security.xacml.core.model.context.ObjectFactory;
+import org.jboss.security.xacml.core.model.context.RequestType;
+import org.jboss.security.xacml.core.model.context.ResponseType;
/**
@@ -37,4 +41,19 @@
{
return _objectFactory;
}
+
+ /**
+ * Create an XACML Authorization Decision Statement Type
+ * @param request
+ * @param response
+ * @return
+ */
+ public static XACMLAuthzDecisionStatementType createXACMLAuthzDecisionStatementType(RequestType request,
+ ResponseType response)
+ {
+ XACMLAuthzDecisionStatementType xacmlStatement = SOAPSAMLXACMLUtil.createXACMLAuthzDecisionStatementType();
+ xacmlStatement.setRequest(request);
+ xacmlStatement.setResponse(response);
+ return xacmlStatement;
+ }
}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java 2009-08-25 20:22:41 UTC (rev 743)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java 2009-08-26 04:11:02 UTC (rev 744)
@@ -26,6 +26,7 @@
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
import org.jboss.identity.federation.saml.v2.assertion.AudienceRestrictionType;
import org.jboss.identity.federation.saml.v2.assertion.ConditionAbstractType;
@@ -44,7 +45,7 @@
* @since Jan 28, 2009
*/
public class SAMLAssertionFactory
-{
+{
private static ObjectFactory factory = new ObjectFactory();
public static ObjectFactory getObjectFactory()
@@ -147,8 +148,8 @@
if (confirmation != null)
subject.getContent().add(factory.createSubjectConfirmation(confirmation));
return subject;
- }
-
+ }
+
/**
* <p>
* Creates a SAMLV2 {@code AssertionType} with the specified values.
@@ -170,11 +171,14 @@
assertion.setID(id);
assertion.setIssuer(issuerID);
assertion.setIssueInstant(issueInstant);
- assertion.setConditions(conditions);
- assertion.setSubject(subject);
+ if(conditions != null)
+ assertion.setConditions(conditions);
+ if(subject != null)
+ assertion.setSubject(subject);
+ assertion.setVersion(JBossSAMLConstants.VERSION_2_0.get());
+
if (statements != null)
assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().addAll(statements);
return assertion;
}
-
}
\ No newline at end of file
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-08-25 20:22:41 UTC (rev 743)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-08-26 04:11:02 UTC (rev 744)
@@ -30,8 +30,10 @@
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
import org.jboss.identity.federation.core.saml.v2.factories.SAMLAssertionFactory;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
+import org.jboss.identity.federation.saml.v2.assertion.AttributeType;
import org.jboss.identity.federation.saml.v2.assertion.ConditionsType;
import org.jboss.identity.federation.saml.v2.assertion.NameIDType;
+import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory;
/**
* Utility to deal with assertions
@@ -59,6 +61,31 @@
}
/**
+ * Create an attribute type
+ * @param name Name of the attribute
+ * @param nameFormat name format uri
+ * @param attributeValues an object array of attribute values
+ * @return
+ */
+ public static AttributeType createAttribute(String name, String nameFormat,
+ Object... attributeValues)
+ {
+ ObjectFactory of = SAMLAssertionFactory.getObjectFactory();
+ AttributeType att = of.createAttributeType();
+ att.setName(name);
+ att.setNameFormat(nameFormat);
+ if(attributeValues != null && attributeValues.length > 0)
+ {
+ for(Object attributeValue:attributeValues)
+ {
+ att.getAttributeValue().add(of.createAttributeValue(attributeValue));
+ }
+ }
+
+ return att;
+ }
+
+ /**
* Add validity conditions to the SAML2 Assertion
* @param assertion
* @param durationInMilis
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r743 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp and 10 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 16:22:41 -0400 (Tue, 25 Aug 2009)
New Revision: 743
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.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/servlets/SOAPSAMLXACMLServlet.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/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java
identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.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/servlets/OpenIDConsumerServlet.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java
identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java
Log:
JBID-176: findbugs analysis
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -54,7 +54,7 @@
{
private static final long serialVersionUID = 1L;
- private IMetadataConfigurationStore configProvider = new FileBasedMetadataConfigurationStore();
+ private transient IMetadataConfigurationStore configProvider = new FileBasedMetadataConfigurationStore();
@Override
public void init(ServletConfig config) throws ServletException
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 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -37,21 +37,20 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.bind.JAXBElement;
-import org.apache.catalina.LifecycleException;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.api.saml.v2.metadata.KeyDescriptorMetaDataBuilder;
import org.jboss.identity.federation.api.saml.v2.metadata.MetaDataBuilder;
import org.jboss.identity.federation.api.util.KeyUtil;
import org.jboss.identity.federation.bindings.providers.IMetadataProvider;
+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.core.saml.v2.constants.JBossSAMLConstants;
import org.jboss.identity.federation.core.util.XMLEncryptionUtil;
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.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;
@@ -68,11 +67,11 @@
private boolean trace = log.isTraceEnabled();
private String configFileLocation = "/WEB-INF/jboss-idfed.xml";
- private MetadataProviderType metadataProviderType = null;
+ private transient MetadataProviderType metadataProviderType = null;
- private IMetadataProvider<?> metadataProvider = null;
+ private transient IMetadataProvider<?> metadataProvider = null;
- private EntityDescriptorType metadata;
+ private transient EntityDescriptorType metadata;
private String signingAlias = null;
private String encryptingAlias = null;
@@ -83,95 +82,88 @@
public void init(ServletConfig config) throws ServletException
{
super.init(config);
- ServletContext context = config.getServletContext();
- String configL = config.getInitParameter("configFile");
- if(configL != null && configL.length() > 0)
- configFileLocation = configL;
- if(trace)
- log.trace("Config File Location="+ configFileLocation);
- InputStream is = context.getResourceAsStream(configFileLocation);
- if(is == null)
- throw new RuntimeException(configFileLocation + " missing");
-
- //Look for signing alias
- signingAlias = config.getInitParameter("signingAlias");
- encryptingAlias = config.getInitParameter("encryptingAlias");
-
try
{
- ProviderType providerType = ConfigurationUtil.getIDPConfiguration(is);
- metadataProviderType = providerType.getMetaDataProvider();
- String fqn = metadataProviderType.getClassName();
- ClassLoader tcl = SecurityActions.getContextClassLoader();
- Class<?> clazz = tcl.loadClass(fqn);
- metadataProvider = (IMetadataProvider) clazz.newInstance();
- List<KeyValueType> keyValues = metadataProviderType.getOption();
- Map<String,String> options = new HashMap<String,String>();
- if(keyValues != null)
- {
- for(KeyValueType kvt: keyValues)
- options.put(kvt.getKey(), kvt.getValue());
- }
- metadataProvider.init(options);
- if(metadataProvider.isMultiple())
- throw new RuntimeException("Multiple Entities not currently supported");
-
- /**
- * Since a metadata provider does not have access to the servlet context.
- * It may be difficult to get to the resource from the TCL.
- */
- String fileInjectionStr = metadataProvider.requireFileInjection();
- if(fileInjectionStr != null && fileInjectionStr.length() > 0)
- {
- metadataProvider.injectFileStream(context.getResourceAsStream(fileInjectionStr));
- }
-
- metadata = (EntityDescriptorType) metadataProvider.getMetaData();
+ ServletContext context = config.getServletContext();
+ String configL = config.getInitParameter("configFile");
+ if(configL != null && configL.length() > 0)
+ configFileLocation = configL;
+ if(trace)
+ log.trace("Config File Location="+ configFileLocation);
+ InputStream is = context.getResourceAsStream(configFileLocation);
+ if(is == null)
+ throw new RuntimeException(configFileLocation + " missing");
- //Get the trust manager information
- KeyProviderType keyProvider = providerType.getKeyProvider();
- signingAlias = keyProvider.getSigningAlias();
- try
- {
- String keyManagerClassName = keyProvider.getClassName();
- if(keyManagerClassName == null)
- throw new RuntimeException("KeyManager class name is null");
-
- clazz = tcl.loadClass(keyManagerClassName);
- this.keyManager = (TrustKeyManager) clazz.newInstance();
- keyManager.setAuthProperties(keyProvider.getAuth());
-
- Certificate cert = keyManager.getCertificate(signingAlias);
- KeyInfoType keyInfo = KeyUtil.getKeyInfo(cert);
-
- //TODO: Assume just signing key for now
- KeyDescriptorType keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo,
- null, 0, true, false);
-
- updateKeyDescriptor(metadata, keyDescriptor);
-
- //encryption
- if(this.encryptingAlias != null)
- {
- cert = keyManager.getCertificate(encryptingAlias);
- keyInfo = KeyUtil.getKeyInfo(cert);
- String certAlgo = cert.getPublicKey().getAlgorithm();
- keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo,
- XMLEncryptionUtil.getEncryptionURL(certAlgo),
- XMLEncryptionUtil.getEncryptionKeySize(certAlgo), false, true);
- updateKeyDescriptor(metadata, keyDescriptor);
- }
- }
- catch(Exception e)
- {
- log.error("Exception reading configuration:",e);
- throw new LifecycleException(e.getLocalizedMessage());
- }
- }
- catch(Exception e)
+ //Look for signing alias
+ signingAlias = config.getInitParameter("signingAlias");
+ encryptingAlias = config.getInitParameter("encryptingAlias");
+
+ ProviderType providerType = ConfigurationUtil.getIDPConfiguration(is);
+ metadataProviderType = providerType.getMetaDataProvider();
+ String fqn = metadataProviderType.getClassName();
+ ClassLoader tcl = SecurityActions.getContextClassLoader();
+ Class<?> clazz = tcl.loadClass(fqn);
+ metadataProvider = (IMetadataProvider) clazz.newInstance();
+ List<KeyValueType> keyValues = metadataProviderType.getOption();
+ Map<String,String> options = new HashMap<String,String>();
+ if(keyValues != null)
+ {
+ for(KeyValueType kvt: keyValues)
+ options.put(kvt.getKey(), kvt.getValue());
+ }
+ metadataProvider.init(options);
+ if(metadataProvider.isMultiple())
+ throw new RuntimeException("Multiple Entities not currently supported");
+
+ /**
+ * Since a metadata provider does not have access to the servlet context.
+ * It may be difficult to get to the resource from the TCL.
+ */
+ String fileInjectionStr = metadataProvider.requireFileInjection();
+ if(fileInjectionStr != null && fileInjectionStr.length() > 0)
+ {
+ metadataProvider.injectFileStream(context.getResourceAsStream(fileInjectionStr));
+ }
+
+ metadata = (EntityDescriptorType) metadataProvider.getMetaData();
+
+ //Get the trust manager information
+ KeyProviderType keyProvider = providerType.getKeyProvider();
+ signingAlias = keyProvider.getSigningAlias();
+ String keyManagerClassName = keyProvider.getClassName();
+ if(keyManagerClassName == null)
+ throw new RuntimeException("KeyManager class name is null");
+
+ clazz = tcl.loadClass(keyManagerClassName);
+ this.keyManager = (TrustKeyManager) clazz.newInstance();
+ keyManager.setAuthProperties(keyProvider.getAuth());
+
+ Certificate cert = keyManager.getCertificate(signingAlias);
+ KeyInfoType keyInfo = KeyUtil.getKeyInfo(cert);
+
+ //TODO: Assume just signing key for now
+ KeyDescriptorType keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo,
+ null, 0, true, false);
+
+ updateKeyDescriptor(metadata, keyDescriptor);
+
+ //encryption
+ if(this.encryptingAlias != null)
+ {
+ cert = keyManager.getCertificate(encryptingAlias);
+ keyInfo = KeyUtil.getKeyInfo(cert);
+ String certAlgo = cert.getPublicKey().getAlgorithm();
+ keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo,
+ XMLEncryptionUtil.getEncryptionURL(certAlgo),
+ XMLEncryptionUtil.getEncryptionKeySize(certAlgo), false, true);
+ updateKeyDescriptor(metadata, keyDescriptor);
+ }
+ } catch(Exception e)
{
- throw new RuntimeException(e);
- }
+ log.error("Exception in starting servlet:",e);
+ throw new ServletException("Unable to start servlet");
+ }
+
}
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -86,7 +86,7 @@
boolean debug = false;
- private PolicyDecisionPoint pdp = null;
+ private transient PolicyDecisionPoint pdp = null;
public void init(ServletConfig config) throws ServletException
{
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 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -537,7 +537,7 @@
}
//Private Methods
- protected class SessionHolder
+ protected static class SessionHolder
{
String samlRequest;
String signature;
Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -71,9 +71,8 @@
{
tokenType = new URI("http://www.tokens.org/SpecialToken");
}
- catch (URISyntaxException e)
- {
- e.printStackTrace();
+ catch (URISyntaxException ignore)
+ {
}
}
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -378,7 +378,7 @@
* Information about a provider from the
* discovery process
*/
- public class OpenIDProviderInformation
+ public static class OpenIDProviderInformation
{
private DiscoveryInformation discovered;
@@ -396,7 +396,7 @@
/**
* List of OpenID providers
*/
- public class OpenIDProviderList
+ public static class OpenIDProviderList
{
private List<DiscoveryInformation> providers = null;
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -115,7 +115,7 @@
return new OpenIDMessage(DirectError.createDirectError(msg));
}
- public class OpenIDMessage
+ public static class OpenIDMessage
{
private Message message;
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -137,7 +137,7 @@
return envelope;
}
- public class Result
+ public static class Result
{
private Fault fault = null;
private DecisionType decisionType;
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -277,6 +277,8 @@
node = this.findNodeByNameNS(result, "RenewTarget", WSTrustConstants.BASE_NAMESPACE);
else if (requestType.equalsIgnoreCase(WSTrustConstants.CANCEL_REQUEST))
node = this.findNodeByNameNS(result, "CancelTarget", WSTrustConstants.BASE_NAMESPACE);
+ if(node == null)
+ throw new RuntimeException("Unsupported request type:" + requestType);
node.appendChild(result.importNode(targetElement, true));
}
}
Modified: identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java
===================================================================
--- identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -141,7 +141,7 @@
private boolean signatureRequired = true;
- protected class AuthenticatedUser
+ protected static class AuthenticatedUser
{
String userName;
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -50,12 +50,14 @@
if(trace)
log.trace("There is no ROLES config");
}
-
- //Get the comma separated role names
- StringTokenizer st = new StringTokenizer(csv,",");
- while(st != null && st.hasMoreTokens())
+ else
{
- roleNames.add(st.nextToken());
+ //Get the comma separated role names
+ StringTokenizer st = new StringTokenizer(csv,",");
+ while(st != null && st.hasMoreTokens())
+ {
+ roleNames.add(st.nextToken());
+ }
}
}
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -45,10 +45,10 @@
public class IDPLoginServlet extends HttpServlet
{
private static final long serialVersionUID = 1L;
- private ServletContext context;
+ private transient ServletContext context;
private String USERNAME_FIELD = "JBID_USERNAME";
private String PASS_FIELD = "JBID_PASSWORD";
- private ILoginHandler loginHandler = null;
+ private transient ILoginHandler loginHandler = null;
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
@@ -158,7 +158,8 @@
RequestDispatcher dispatch = context.getRequestDispatcher("/IDPServlet");
if(dispatch == null)
log("Cannot dispatch to the IDP Servlet");
- dispatch.forward(request, response);
+ else
+ dispatch.forward(request, response);
return;
}
@@ -168,7 +169,8 @@
RequestDispatcher dispatch = context.getRequestDispatcher("/jsp/login.jsp");
if(dispatch == null)
log("Cannot find the login page");
- dispatch.forward(request, response);
+ else
+ dispatch.forward(request, response);
return;
}
}
\ No newline at end of file
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 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -37,6 +37,8 @@
import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
+import org.jboss.identity.federation.core.config.IDPType;
+import org.jboss.identity.federation.core.config.KeyProviderType;
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.exceptions.ParsingException;
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
@@ -44,8 +46,6 @@
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.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;
@@ -70,21 +70,21 @@
public static final String PRINCIPAL_ID = "jboss_identity.principal";
public static final String ROLES_ID = "jboss_identity.roles";
- protected IDPType idpConfiguration = null;
+ protected transient IDPType idpConfiguration = null;
- private RoleGenerator rg = new DefaultRoleGenerator();
+ private transient RoleGenerator rg = new DefaultRoleGenerator();
private long assertionValidity = 5000; // 5 seconds in miliseconds
private String identityURL = null;
- private TrustKeyManager keyManager;
+ private transient TrustKeyManager keyManager;
private Boolean ignoreIncomingSignatures = true;
private Boolean signOutgoingMessages = true;
- private ServletContext context = null;
+ private transient ServletContext context = null;
public Boolean getIgnoreIncomingSignatures()
{
@@ -196,7 +196,7 @@
boolean isPost = webRequestUtil.hasSAMLRequestInPostProfile();
boolean isValid = validate(request.getRemoteAddr(),
request.getQueryString(),
- new SessionHolder(samlMessage, null, null), isPost);
+ new SessionHolder(samlMessage, null), isPost);
if(!isValid)
throw new GeneralSecurityException("Validation check failed");
@@ -339,17 +339,15 @@
}
- protected class SessionHolder
+ protected static class SessionHolder
{
String samlRequest;
- String signature;
- String sigAlg;
+ String signature;
- public SessionHolder(String req, String sig, String alg)
+ public SessionHolder(String req, String sig)
{
this.samlRequest = req;
- this.signature = sig;
- this.sigAlg = alg;
+ this.signature = sig;
}
}
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -50,7 +50,7 @@
{
private static final long serialVersionUID = 1L;
- private ServletContext servletContext;
+ private transient ServletContext servletContext;
private String returnURL;
@Override
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -44,10 +44,10 @@
public class OpenIDProviderServlet extends HttpServlet
{
private static final long serialVersionUID = 1L;
- private ServletContext servletContext = null;
+ private transient ServletContext servletContext = null;
private String securePageName = "securepage.jsp";
- private OpenIDProviderManager serverManager = new OpenIDProviderManager();
+ private transient OpenIDProviderManager serverManager = new OpenIDProviderManager();
//private ServerManager serverManager = new ServerManager();
@Override
Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -46,7 +46,7 @@
private boolean supportHTTP_HEAD = false; //By default, we support GET
- private InputStream yadisResourceInputStream = null;
+ private transient InputStream yadisResourceInputStream = null;
@Override
public void init(ServletConfig config) throws ServletException
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 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -405,13 +405,7 @@
if(supportSignature)
{
try
- {
- //SigAlg
- String algo = keyManager.getSigningKey().getAlgorithm();
- String sigAlg = SignatureUtil.getXMLSignatureAlgorithmURI(algo);
-
- sigAlg = URLEncoder.encode(sigAlg, "UTF-8");
-
+ {
SAML2Signature ss = new SAML2Signature();
samlResponse = ss.sign(responseType, keyManager.getSigningKeyPair());
}
Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java 2009-08-25 18:09:02 UTC (rev 742)
+++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java 2009-08-25 20:22:41 UTC (rev 743)
@@ -79,7 +79,7 @@
}
//A provider servlet that always returns true
- private class ProviderServlet extends HttpServlet
+ private static class ProviderServlet extends HttpServlet
{
private static final long serialVersionUID = 1L;
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r742 - identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 14:09:02 -0400 (Tue, 25 Aug 2009)
New Revision: 742
Modified:
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java
Log:
fix the token provider
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 17:57:05 UTC (rev 741)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java 2009-08-25 18:09:02 UTC (rev 742)
@@ -184,7 +184,7 @@
}
catch (JAXBException e)
{
- throw new RuntimeException(e);
+ throw new WSTrustException("Unmarshalling error:",e);
}
}
}
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r741 - identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 13:57:05 -0400 (Tue, 25 Aug 2009)
New Revision: 741
Modified:
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java
Log:
fix the token provider
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:53:01 UTC (rev 740)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAML20TokenProvider.java 2009-08-25 17:57:05 UTC (rev 741)
@@ -155,6 +155,9 @@
ValidateTargetType validateTarget = context.getRequestSecurityToken().getValidateTarget();
if(validateTarget == null)
throw new WSTrustException("Invalid validate message: missing required ValidateTarget");
+
+ String code = WSTrustConstants.STATUS_CODE_VALID;
+ String reason = "SAMLV2.0 Assertion successfuly validated";
AssertionType assertion = null;
@@ -166,19 +169,26 @@
}
else if(assertionObj instanceof Element)
{
- try
+ Element assertionElement = (Element) assertionObj;
+
+ if(!this.isAssertion(assertionElement))
{
- assertion = SAMLUtil.fromElement((Element) assertionObj);
+ code = WSTrustConstants.STATUS_CODE_INVALID;
+ reason = "Validation failure: supplied token is not a SAMLV2.0 Assertion";
}
- catch (JAXBException e)
+ else
{
- throw new RuntimeException(e);
+ try
+ {
+ assertion = SAMLUtil.fromElement((Element) assertionObj);
+ }
+ 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
{
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r740 - identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 12:53:01 -0400 (Tue, 25 Aug 2009)
New Revision: 740
Removed:
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/AuthPropertyType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncAlgoType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncryptionType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/IDPType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyProviderType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyValueType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/MetadataProviderType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ObjectFactory.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ProviderType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/SPType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/STSType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProviderType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProvidersType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProviderType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProvidersType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TrustType.java
identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/package-info.java
Log:
JBID-175: JAXBContext created once
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/AuthPropertyType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/AuthPropertyType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/AuthPropertyType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,39 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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
-{
-
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncAlgoType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncAlgoType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncAlgoType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,59 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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);
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncryptionType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncryptionType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/EncryptionType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,89 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/IDPType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/IDPType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/IDPType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,170 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyProviderType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyProviderType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyProviderType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,170 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyValueType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyValueType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/KeyValueType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,96 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/MetadataProviderType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/MetadataProviderType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/MetadataProviderType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,105 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ObjectFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ObjectFactory.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ObjectFactory.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,184 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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.web.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.web.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);
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ProviderType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ProviderType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ProviderType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,199 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/SPType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/SPType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/SPType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,73 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/STSType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/STSType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/STSType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,247 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProviderType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProviderType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProviderType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,126 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProvidersType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProvidersType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/ServiceProvidersType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,81 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProviderType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProviderType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProviderType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,92 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProvidersType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProvidersType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TokenProvidersType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,83 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TrustType.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TrustType.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/TrustType.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,71 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.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;
- }
-
-}
Deleted: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/package-info.java
===================================================================
--- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/package-info.java 2009-08-25 16:51:29 UTC (rev 739)
+++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/config/package-info.java 2009-08-25 16:53:01 UTC (rev 740)
@@ -1,9 +0,0 @@
-//
-// 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/jaxb</a>
-// 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.web.config;
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r739 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets and 13 other directories.
by jboss-identity-commits＠lists.jboss.org
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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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/jaxb</a>
+// 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;
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r738 - in identity-federation/trunk/jboss-identity-webapps: pdp and 7 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-25 12:46:03 -0400 (Tue, 25 Aug 2009)
New Revision: 738
Added:
identity-federation/trunk/jboss-identity-webapps/pdp/src/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/META-INF/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-01-top-level.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02a-CDA.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02b-N.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02c-N-PermCollections.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02d-prog-note.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02e-MA.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02f-emergency.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-03-N-RPS-virt-med-rec-role.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-04-N-PPS-PRD-004.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/himss-policy.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml
identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/web.xml
Removed:
identity-federation/trunk/jboss-identity-webapps/pdp/resources/
Modified:
identity-federation/trunk/jboss-identity-webapps/idp/pom.xml
identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml
identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml
Log:
fix the webapps resources
Modified: identity-federation/trunk/jboss-identity-webapps/idp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/idp/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
+++ identity-federation/trunk/jboss-identity-webapps/idp/pom.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -30,7 +30,6 @@
<version>2.0.2</version>
<configuration>
<warName>idp</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
</configuration>
</plugin>
Modified: identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/pom.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -30,7 +30,6 @@
<version>2.0.2</version>
<configuration>
<warName>pdp</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
</configuration>
</plugin>
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-01-top-level.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-01-top-level.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-01-top-level.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Top level policy set which combines the CDA and N confidentiality codes.
+ </Description>
+ <Target/>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel:emergency"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target/>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:emergency</PolicySetIdReference>
+ </PolicySet>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel:CDA"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >UBA</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:confidentiality-code"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:CDA</PolicySetIdReference>
+ </PolicySet>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel:MA"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides">
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >MA</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:confidentiality-code"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:MA</PolicySetIdReference>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:MA:default-to-permit"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides">
+ <Target/>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:MA"
+ Effect="Permit">
+ <Description>
+ If a Deny was obtained for object above then set Permit by default.
+ </Description>
+ </Rule>
+ </Policy>
+ </PolicySet>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel:bus-rule"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:progress-note</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:progress-note</PolicySetIdReference>
+ </PolicySet>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:toplevel:N"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides">
+ <Target/>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N</PolicySetIdReference>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N:PermCollections</PolicySetIdReference>
+ </PolicySet>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02a-CDA.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02a-CDA.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02a-CDA.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:CDA"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for the UBA confidentiality code.
+ </Description>
+ <Target/>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:CDA"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides">
+ <Target/>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:CDA:1"
+ Effect="Permit">
+ <Description>
+ If the access subject is NOT one of those users which consent has
+ been removed, then permit.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if hl7:dissented-subject-id NOT EQUAL TO subject:subject-id -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <!-- True if hl7:dissented-subject-id EQUAL TO subject:subject-id -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
+ <SubjectAttributeDesignator
+ AttributeId="urn:oasis:names:tc:xacml:1.0:subject:subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:dissented-subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:CDA:2"
+ Effect="Deny">
+ <Description>
+ If a Permit was not obtained above then set Deny by default.
+ </Description>
+ </Rule>
+ <Obligations>
+ <!-- These obligations provide specific instructions to PEP in the response -->
+ <!-- This obligation instructs the PEP to apply privacy constraints to -->
+ <!-- user's responsibility for the data. -->
+ <Obligation
+ ObligationId="urn:va:xacml:2.0:interop:rsa8:obligation:privacy:constraint"
+ FulfillOn="Deny"/>
+ </Obligations>
+ </Policy>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02b-N.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02b-N.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02b-N.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for evaluating the subject:role attributes.
+ This implements an RBAC policy. This policy set matches
+ subject roles and refers to permission policy sets.
+ </Description>
+ <Target/>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:RPS:physician"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target>
+ <Subjects>
+ <Subject>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:role:hl7:physician</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ </Subject>
+ </Subjects>
+ </Target>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N:RPS:med-rec-vrole</PolicySetIdReference>
+ </PolicySet>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02c-N-PermCollections.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02c-N-PermCollections.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02c-N-PermCollections.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:PermCollections"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for evaluating the subject:hl7:permission attributes.
+ This implements an RBAC policy. This policy set matches
+ subject roles and refers to permission policy sets.
+ </Description>
+ <Target/>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:med-rec-perm-set"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides">
+ <Target/>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:med-rec-perm-set-0"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target/>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N:RPS:med-rec-vrole</PolicySetIdReference>
+ </PolicySet>
+ <PolicySet
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:med-rec-perm-set-1"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target>
+ <Subjects>
+ <Subject>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-003</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-005</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-006</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-009</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-010</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-012</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ <SubjectMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:prd-017</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </SubjectMatch>
+ </Subject>
+ </Subjects>
+ </Target>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N:RPS:med-rec-vrole</PolicySetIdReference>
+ </PolicySet>
+ </PolicySet>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02d-prog-note.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02d-prog-note.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02d-prog-note.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:progress-note"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for the business rule for unsigned progress notes.
+ </Description>
+ <Target/>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:progress-note"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides">
+ <Target/>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:progress-note:sig"
+ Effect="Permit">
+ <Description>
+ If the progress-note is signed allow any user to see it. If not signed
+ then only author may see it.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if resource:hl7:progress-note:signed EQUAL TO True -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >True</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:progress-note:signed"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:progress-note:author"
+ Effect="Permit">
+ <Description>
+ If a Permit was not obtained then subject must be author.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if hl7:dissented-subject-id EQUAL TO subject:subject-id -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
+ <SubjectAttributeDesignator
+ AttributeId="urn:oasis:names:tc:xacml:1.0:subject:subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:progress-note:author-subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:progress-note:deny-sig"
+ Effect="Deny">
+ <Description>
+ If a Permit was not obtained above then set Deny by default.
+ </Description>
+ </Rule>
+ <Obligations>
+ <!-- These obligations provide specific instructions to PEP in the response -->
+ <!-- This obligation informs the PEP access denied unsigned non-author -->
+ <Obligation
+ ObligationId="urn:va:xacml:2.0:interop:rsa8:obligation:deny:unsigned:non-author"
+ FulfillOn="Deny"/>
+ </Obligations>
+ </Policy>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02e-MA.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02e-MA.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02e-MA.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:MA"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for the MA confidentiality code.
+ </Description>
+ <Target/>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:MA"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Target/>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:MA:1"
+ Effect="Deny">
+ <Description>
+ If the access subject is NOT one of those users which consent has
+ been removed, then deny.
+ Note: there is reverse logic here because the Obligation that denies
+ access to the user for this object must be issued when the user has
+ obtained a Permit. So, the caller of this policy must know to reverse
+ sense as well.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if hl7:radiology:dissented-subject-id NOTEQUALTO subject:subject-id -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <!-- True if hl7:radiology:dissented-subject-id EQUALTO subject:subject-id -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
+ <SubjectAttributeDesignator
+ AttributeId="urn:oasis:names:tc:xacml:1.0:subject:subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ <ResourceAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:resource:hl7:radiology:dissented-subject-id"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:MA:2"
+ Effect="Permit">
+ <Description>
+ If a Deny was not obtained above then set Permit by default.
+ </Description>
+ </Rule>
+ <Obligations>
+ <!-- These obligations provide specific instructions to PEP in the response -->
+ <!-- This obligation instructs the PEP to apply privacy constraints to -->
+ <!-- user's responsibility for the data. -->
+ <Obligation
+ ObligationId=
+ "urn:va:xacml:2.0:interop:rsa8:obligation:ma:privacy:constraint:radiology"
+ FulfillOn="Permit"/>
+ </Obligations>
+ </Policy>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02f-emergency.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02f-emergency.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-02f-emergency.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:emergency"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set to allow emergency access for non-facility subjects.
+ Returns Deny if user not from supported facility AND does not have emergency perm
+ Returns Permit if not from supported facility AND not denied access
+ Returns NotApplicable if plain old user from supported facility
+ </Description>
+ <Target/>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:emergency"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Target/>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:emergency:deny"
+ Effect="Deny">
+ <Description>
+ If the subject is not from a supported facility AND
+. if the subject does not have emergency permission THEN Deny access.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if subject:locality NOT EQUAL TO ANYOF environment:locality -->
+ <!-- AND if hl7:pea-001 NOT EQUAL TO ANYOF subject:hl7:permission -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <!-- True if subject:locality NOT EQUAL TO ANYOF environment:locality -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
+ <SubjectAttributeDesignator
+ AttributeId=
+ "urn:oasis:names:tc:xacml:1.0:subject:locality"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ <EnvironmentAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:environment:locality"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Apply>
+ <!-- True if hl7:pea-001 NOT EQUAL TO ANYOF subject:hl7:permission -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:hl7:pea-001</AttributeValue>
+ <SubjectAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:emergency:permit"
+ Effect="Permit">
+ <Description>
+ If a Deny was not obtained above AND subject not part of a supported
+ facility then subject must have emergency permission.
+ </Description>
+ <Target/>
+ <Condition>
+ <!-- True if subject:locality NOT EQUAL TO ANYOF environment:locality -->
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:any-of">
+ <Function FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-equal"/>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
+ <SubjectAttributeDesignator
+ AttributeId=
+ "urn:oasis:names:tc:xacml:1.0:subject:locality"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ <EnvironmentAttributeDesignator
+ AttributeId=
+ "urn:va:xacml:2.0:interop:rsa8:environment:locality"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <!-- These obligations provide specific instructions to PEP in the response -->
+ <!-- This obligation informs the PEP user granted emergency access -->
+ <Obligation
+ ObligationId="urn:va:xacml:2.0:interop:rsa8:obligation:emergency:permit"
+ FulfillOn="Permit"/>
+ </Obligations>
+ </Policy>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-03-N-RPS-virt-med-rec-role.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-03-N-RPS-virt-med-rec-role.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-03-N-RPS-virt-med-rec-role.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId=
+ "urn:va:xacml:2.0:interop:rsa8:policysetid:N:RPS:med-rec-vrole"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set that points to the Permission PolicySet for medical record
+ resources and actions.
+ </Description>
+ <Target/>
+ <PolicySetIdReference
+ >urn:va:xacml:2.0:interop:rsa8:policysetid:N:PPS:PRD-004</PolicySetIdReference>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-04-N-PPS-PRD-004.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-04-N-PPS-PRD-004.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/XacmlPolicySet-04-N-PPS-PRD-004.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PolicySet
+ xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os
+ http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:va:xacml:2.0:interop:rsa8:policysetid:N:PPS:PRD-004"
+ PolicyCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>
+ Policy set for the PRD-004 permission. This permission allows
+ access to all medical records.
+ </Description>
+ <Target/>
+ <Policy
+ PolicyId="urn:va:xacml:2.0:interop:rsa8:policyid:N:PPS:PRD-004:1"
+ RuleCombiningAlgId=
+ "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides">
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:medical-record</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:demographics</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:chart</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:problemlist</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:procedures</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:laboratory</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:radiology</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:medications</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:vitals</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:progress-note</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ <Resource>
+ <ResourceMatch
+ MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ >urn:va:xacml:2.0:interop:rsa8:resource:hl7:patientsearch</AttributeValue>
+ <ResourceAttributeDesignator
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:type"
+ DataType="http://www.w3.org/2001/XMLSchema#string"/>
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:policy:N:PPS:PRD-004:1:rule:1"
+ Effect="Permit">
+ <Condition>
+
+ <!-- Returns true iff the first argument is a subset of the second argument -->
+ <!-- i.e. the permissions required by the resource must be a -->
+ <!-- subset of the permissions supplied by the subject -->
+
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+
+ <!-- 1st argument: returns the values of all Attributes with -->
+ <!-- DataType="http://www.w3.org/2001/XMLSchema#string" and -->
+ <!-- AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:permission" -->
+ <ResourceAttributeDesignator
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:resource:hl7:permission"/>
+
+ <!-- 2nd argument: returns the values of all Attributes with -->
+ <!-- DataType="http://www.w3.org/2001/XMLSchema#string" and -->
+ <!-- AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission" -->
+ <SubjectAttributeDesignator
+ DataType="http://www.w3.org/2001/XMLSchema#string"
+ AttributeId="urn:va:xacml:2.0:interop:rsa8:subject:hl7:permission"/>
+
+ </Apply>
+ </Condition>
+ </Rule>
+ <Rule
+ RuleId="urn:va:xacml:2.0:interop:rsa8:rule:N:PPS:PRD-004:1:rule:2"
+ Effect="Deny">
+ <Description>
+ If a Permit was not obtained above then set Deny by default.
+ </Description>
+ </Rule>
+ </Policy>
+</PolicySet>
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/himss-policy.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/himss-policy.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policies/himss-policy.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PolicySet xmlns="urn:oasis:names:tc:xacml:2.0:policy:schema:os"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:xacml:2.0:policy:schema:os http://docs.oasis-open.org/xacml/access_control-xacml-2.0-policy-schema-o..."
+ PolicySetId="urn:oasis:names:tc:xspa:1.0"
+ PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Target />
+ <PolicySet PolicySetId="urn:oasis:names:tc:xspa:1.0:org" PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>Contains all organizational policies which are evaluated on all requests.</Description>
+ <Target />
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:org:allowed:organizations" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ The organization denies the request if the subject is attempting to access
+ a resource and is not a member of the allowed organizations.
+ </Description>
+ <Target />
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:org:allowed:organizations:deny" Effect="Deny">
+ <Description>Evaluates the allowed-organizations (if available) against the subject's locality.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:allowed-organizations" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:locality" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:allowed-organizations" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:org:hoursofoperations" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ The organization denies the request if the subject is attempting to access
+ the resource outside of the alloted time.
+ </Description>
+ <Target />
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:org:hoursofoperation:deny" Effect="Deny">
+ <Description>Evaluates the environment time against the hours of operation start and end.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:or">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-greater-than-or-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-one-and-only">
+ <EnvironmentAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:1.0:environment:current-time" DataType="http://www.w3.org/2001/XMLSchema#time" />
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-one-and-only">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hoursofoperation:start" DataType="http://www.w3.org/2001/XMLSchema#time" />
+ </Apply>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-less-than-or-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-one-and-only">
+ <EnvironmentAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:1.0:environment:current-time" DataType="http://www.w3.org/2001/XMLSchema#time" />
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:time-one-and-only">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hoursofoperation:end" DataType="http://www.w3.org/2001/XMLSchema#time" />
+ </Apply>
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+
+ <!-- SUBJECT.STRUCTURED-ROLE NOT IN ORG.REQUIRED-ROLES -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:org:required:roles" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ The organization denies the request if the subject is attempting to access
+ a resource and they are not a member of the required role(s).
+ </Description>
+ <Target />
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:org:required:roles:deny" Effect="Deny">
+ <Description>Evaluates the organization roles (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <!-- MAY NEED TO SWITCH ~~ Is this a one to many relationship? Are all roles required or does the subject just need to be included? -->
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+
+ <!-- SUBJECT.PERMISSIONS NOT IN ORG.RESOURCE.PERMISSIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:org.resource.permissions" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ The organization denies the request if the subject does not have adequate
+ permissions to access the resource.
+ </Description>
+ <Target />
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:org:resource.permissions:deny" Effect="Deny">
+ <Description>Evaluates the required permissions (if available) against the subject's permissions.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hl7:permission" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:org:hl7:permission" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:hl7:permission" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:org.catch-all" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides">
+ <Description></Description>
+ <Target />
+ <Rule RuleId="" Effect="Permit"></Rule>
+ </Policy>
+ </PolicySet>
+
+ <PolicySet PolicySetId="urn:oasis:names:tc:xspa:1.0:patient" PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides">
+ <Description>These policies are patient consent directives and are invoked on medical-record requests.</Description>
+ <Target />
+
+ <!-- (RESOURCE.RESOURCETYPE IN PATIENT.MASKEDOBJECT) AND (SUBJECT.ROLE IN PATIENT.MA.DISSENTING-ROLES) -->
+ <!-- PROBLEMS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:problems:dissenting-roles" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for problems from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:problems:dissenting-roles:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-roles for problems (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-role" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+ <!-- MEDICATIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:medications:dissenting-roles" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for medications from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:medications:dissenting-roles:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-roles for medications (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-role" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+ <!-- ALERTS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:alerts:dissenting-roles" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request alerts from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:alerts:dissenting-roles:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-roles for alerts (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-role" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+
+ <!-- IMMUNIZATIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:immunizations:dissenting-roles" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for immunizations from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:immunizations:dissenting-roles:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-roles for immunizations (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-role" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+
+ <!-- (RESOURCE.RESOURCETYPE IN PATIENT.MASKEDOBJECT) AND (SUBJECT.ROLE IN PATIENT.MA.DISSENTING-ROLES) -->
+ <!-- PROBLEMS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:problems:dissenting-subject-ids" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for problems from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:problems:dissenting-subject-ids:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-subject-id's for problems (if available) against the subject's NPI.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Problems:dissenting-subject-id" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+ <!-- MEDICATIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:medications:dissenting-subject-ids" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for medications from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:medications:dissenting-subject-ids:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-subject-id's for medications (if available) against the subject's NPI.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Medications:dissenting-subject-id" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+ <!-- ALERTS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:alerts:dissenting-subject-ids" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for alerts from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:alerts:dissenting-subject-ids:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-subject-id's for alerts (if available) against the subject's NPI.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Alerts:dissenting-subject-id" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+ <!-- IMMUNIZATIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:immunizations:dissenting-subject-ids" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request for immunizations from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:immunizations:dissenting-subject-ids:permit" Effect="Permit">
+ <Description>Evaluates the dissenting-subject-id's for immunizations (if available) against the subject's NPI.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ <Obligations>
+ <Obligation ObligationId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:Immunizations:dissenting-subject-id" FulfillOn="Permit"></Obligation>
+ </Obligations>
+ </Policy>
+
+ <!-- SUBJECT.LOCALITY NOT IN PATIENT.ALLOWED-ORGANIZATIONS -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:patient:allowed:organizations" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request from the subject if their locality is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:patient:allowed:organizations:deny" Effect="Deny">
+ <Description>Evaluates the allowed-organizations (if available) against the subject's locality.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:allowed-organizations" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:locality" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:allowed-organizations" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+
+ <!-- SUBJECT.ROLE IN PATIENT.DISSENTING-ROLES -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:dissenting:role" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request from the subject if their role is not permitted by the patient.
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:patient:dissenting:roles:deny" Effect="Deny">
+ <Description>Evaluates the dissenting-role (if available) against the subject's role.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xacml:2.0:subject:role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:dissenting-role" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+
+ <!-- SUBJECT.ID IN PATIENT.DISSENTING-ID -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0:resource:patient:dissenting-subject-ids" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request from the subject if the NPI is not permitted by the patient.
+ </Description>
+ <Target />
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0:resource:patient:masked:problems:dissenting-subject-ids:deny" Effect="Deny">
+ <Description>Evaluates the dissenting-subject-id (if available) against the subject's NPI.</Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:not">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:integer-equal">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag-size">
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#integer">0</AttributeValue>
+ </Apply>
+ </Apply>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-subset">
+ <SubjectAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:subject:npi" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:patient:dissenting-subject-id" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+
+ <!-- CONFIDENTIALITY -->
+ <Policy PolicyId="urn:oasis:names:tc:xspa:1.0.resource:patient:hl7:confidentiality-codes" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides">
+ <Description>
+ Denies the request from the subject if the confidentiality code is set to "Sensitive". This policy
+ is acting as the "Catch-All".
+ </Description>
+ <Target>
+ <Resources>
+ <Resource>
+ <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:oasis:names:tc:xspa:1.0:resource:hl7:type:medical-record</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0:resource:hl7:type" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </ResourceMatch>
+ </Resource>
+ </Resources>
+ </Target>
+ <Rule RuleId="urn:oasis:names:tc:xspa:1.0.resource:patient:hl7:confidentiality-code:deny" Effect="Deny">
+ <Description>Evaluates the HL7 confidentiality-code.</Description>
+ <Target />
+ <Condition>
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:and">
+ <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-is-in">
+ <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">S</AttributeValue>
+ <ResourceAttributeDesignator AttributeId="urn:oasis:names:tc:xspa:1.0.resource:patient:hl7:confidentiality-code" DataType="http://www.w3.org/2001/XMLSchema#string" />
+ </Apply>
+ </Apply>
+ </Condition>
+ </Rule>
+ </Policy>
+ </PolicySet>
+</PolicySet>
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/classes/policyConfig.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,11 @@
+<ns:jbosspdp xmlns:ns="urn:jboss:xacml:2.0">
+ <ns:Policies>
+ <ns:PolicySet>
+ <ns:Location>policies/himss-policy.xml</ns:Location>
+ </ns:PolicySet>
+ </ns:Policies>
+ <ns:Locators>
+ <ns:Locator Name="org.jboss.security.xacml.locators.JBossPolicySetLocator">
+ </ns:Locator>
+ </ns:Locators>
+</ns:jbosspdp>
Added: identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ identity-federation/trunk/jboss-identity-webapps/pdp/src/main/webapp/WEB-INF/web.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <display-name>PDP Endpoint</display-name>
+ <description>
+ XACML PDP Web Application for the JBoss Identity project
+ </description>
+
+ <context-param>
+ <param-name>debug</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>SOAPServlet</servlet-name>
+ <servlet-class>org.jboss.identity.federation.bindings.servlets.SOAPSAMLXACMLServlet</servlet-class>
+ <!-- Issuer is the string used in the issuer of saml messages/assertions/statements-->
+ <init-param>
+ <param-name>issuer</param-name>
+ <param-value>redhatPdpEntity</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SOAPServlet</servlet-name>
+ <url-pattern>/SOAPServlet</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml
===================================================================
--- identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
+++ identity-federation/trunk/jboss-identity-webapps/sales-sig/pom.xml 2009-08-25 16:46:03 UTC (rev 738)
@@ -30,7 +30,6 @@
<version>2.0.2</version>
<configuration>
<warName>sales-sig</warName>
- <webappDirectory>${basedir}/resources/</webappDirectory>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
</configuration>
</plugin>
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r737 - in consolidated-build/trunk: identity-build-idm and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-24 12:24:57 -0400 (Mon, 24 Aug 2009)
New Revision: 737
Modified:
consolidated-build/trunk/identity-build-idm/pom.xml
consolidated-build/trunk/identity-build-jbas/pom.xml
consolidated-build/trunk/identity-build-openid/pom.xml
consolidated-build/trunk/identity-build-tomcat/pom.xml
consolidated-build/trunk/parent/pom.xml
consolidated-build/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: consolidated-build/trunk/identity-build-idm/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-idm/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/identity-build-idm/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-jbas/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/identity-build-jbas/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-openid/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-openid/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/identity-build-openid/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-tomcat/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/parent/pom.xml
===================================================================
--- consolidated-build/trunk/parent/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/parent/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<name>JBoss Identity build- Parent</name>
<url>http://labs.jboss.org/portal/jbossidentity/</url>
<description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
</scm>
<build>
Modified: consolidated-build/trunk/pom.xml
===================================================================
--- consolidated-build/trunk/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
+++ consolidated-build/trunk/pom.xml 2009-08-24 16:24:57 UTC (rev 737)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.beta1</version>
+ <version>1.0.0.beta1-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r736 - in consolidated-build/tags: 1.0.0.beta1 and 5 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-24 12:24:44 -0400 (Mon, 24 Aug 2009)
New Revision: 736
Added:
consolidated-build/tags/1.0.0.beta1/
consolidated-build/tags/1.0.0.beta1/README
consolidated-build/tags/1.0.0.beta1/identity-build-idm/
consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml
consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml
consolidated-build/tags/1.0.0.beta1/parent/pom.xml
consolidated-build/tags/1.0.0.beta1/pom.xml
Removed:
consolidated-build/tags/1.0.0.beta1/identity-build-idm/
consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml
consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml
consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml
consolidated-build/tags/1.0.0.beta1/parent/pom.xml
consolidated-build/tags/1.0.0.beta1/pom.xml
Log:
[maven-release-plugin] copy for tag 1.0.0.beta1
Copied: consolidated-build/tags/1.0.0.beta1 (from rev 732, consolidated-build/trunk)
Copied: consolidated-build/tags/1.0.0.beta1/README (from rev 734, consolidated-build/trunk/README)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/README (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/README 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,2 @@
+When you make a release, please do update the idm and idfed versions in the pom.xml of
+jboss-identity-bindings-jbas and jboss-identity-bindings-tomcat
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-idm (from rev 733, consolidated-build/trunk/identity-build-idm)
Deleted: consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml
===================================================================
--- consolidated-build/trunk/identity-build-idm/bin.xml 2009-08-24 16:22:37 UTC (rev 733)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,25 +0,0 @@
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <scope>compile</scope>
- <excludes>
- <exclude>org.jboss.identity.idm.integration:idm-jboss5</exclude>
- <exclude>org.jboss.identity.idm:idm-cache</exclude>
- <exclude>org.jboss.identity.idm:idm-ldap</exclude>
- <exclude>org.jboss.identity.idm:idm-hibernate</exclude>
- <exclude>org.jboss.identity.idm:idm-core</exclude>
- <exclude>org.jboss.identity.idm:idm-api</exclude>
- <exclude>org.jboss.identity.idm:idm-common</exclude>
- <exclude>org.jboss.identity.idm:idm-spi</exclude>
- <exclude>org.jboss.identity.idm:idm-assembly</exclude>
- </excludes>
- <outputDirectory>/</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml (from rev 732, consolidated-build/trunk/identity-build-idm/bin.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-idm/bin.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,25 @@
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <scope>compile</scope>
+ <excludes>
+ <exclude>org.jboss.identity.idm.integration:idm-jboss5</exclude>
+ <exclude>org.jboss.identity.idm:idm-cache</exclude>
+ <exclude>org.jboss.identity.idm:idm-ldap</exclude>
+ <exclude>org.jboss.identity.idm:idm-hibernate</exclude>
+ <exclude>org.jboss.identity.idm:idm-core</exclude>
+ <exclude>org.jboss.identity.idm:idm-api</exclude>
+ <exclude>org.jboss.identity.idm:idm-common</exclude>
+ <exclude>org.jboss.identity.idm:idm-spi</exclude>
+ <exclude>org.jboss.identity.idm:idm-assembly</exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Deleted: consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-idm/pom.xml 2009-08-24 16:22:37 UTC (rev 733)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,166 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-build-idm</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity dependency pack for IDM</name>
- <url>http://www.jboss.org/jbossidentity/</url>
- <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
-
- <properties>
- <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations>
- <hibernate-tools-version>3.2.0.ga</hibernate-tools-version>
- <hsqldb-version>1.8.0.7</hsqldb-version>
- <idm.version>1.0.0.Beta1</idm.version>
- <apache.ant.version>1.7.0</apache.ant.version>
- <mysql.connector.version>5.0.8</mysql.connector.version>
- <postgresql.version>8.3-603.jdbc3</postgresql.version>
- <jtds.version>1.2.2</jtds.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-api</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-common</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-spi</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-core</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-hibernate</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-ldap</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>idm-cache</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm.integration</groupId>
- <artifactId>idm-jboss5</artifactId>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm.integration</groupId>
- <artifactId>idm-jboss5-deployer</artifactId>
- <classifier>config</classifier>
- <type>zip</type>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity.idm.integration</groupId>
- <artifactId>idm-jboss5-deployer</artifactId>
- <classifier>deployer</classifier>
- <type>zip</type>
- <version>${idm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate-commons-annotations}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-tools</artifactId>
- <version>${hibernate-tools-version}</version>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${apache.ant.version}</version>
- </dependency>
-
- <!-- Database Drivers -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgresql.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>${jtds.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>bundle-project-sources</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Identity</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Identity</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml (from rev 735, consolidated-build/trunk/identity-build-idm/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-idm/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,166 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <version>1.0.0.beta1</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-build-idm</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity dependency pack for IDM</name>
+ <url>http://www.jboss.org/jbossidentity/</url>
+ <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+
+ <properties>
+ <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations>
+ <hibernate-tools-version>3.2.0.ga</hibernate-tools-version>
+ <hsqldb-version>1.8.0.7</hsqldb-version>
+ <idm.version>1.0.0.Beta1</idm.version>
+ <apache.ant.version>1.7.0</apache.ant.version>
+ <mysql.connector.version>5.0.8</mysql.connector.version>
+ <postgresql.version>8.3-603.jdbc3</postgresql.version>
+ <jtds.version>1.2.2</jtds.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-api</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-common</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-spi</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-core</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-hibernate</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-ldap</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-cache</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm.integration</groupId>
+ <artifactId>idm-jboss5</artifactId>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm.integration</groupId>
+ <artifactId>idm-jboss5-deployer</artifactId>
+ <classifier>config</classifier>
+ <type>zip</type>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm.integration</groupId>
+ <artifactId>idm-jboss5-deployer</artifactId>
+ <classifier>deployer</classifier>
+ <type>zip</type>
+ <version>${idm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate-commons-annotations}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <version>${hibernate-tools-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${apache.ant.version}</version>
+ </dependency>
+
+ <!-- Database Drivers -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>${jtds.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-08-24 15:56:16 UTC (rev 732)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,81 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-build-jbas</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity build to run on JBoss AS</name>
- <url>http://labs.jboss.org/portal/jbossidentity/</url>
- <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>jbossidm</artifactId>
- <version>${idm}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-bindings-jboss</artifactId>
- <version>${idfed}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed</artifactId>
- <version>${idfed}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>bundle-project-sources</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Identity</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Identity</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <idm>1.0.0.Beta1</idm>
- <idfed>1.0.0.alpha5</idfed>
- </properties>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml (from rev 735, consolidated-build/trunk/identity-build-jbas/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-jbas/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <version>1.0.0.beta1</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-build-jbas</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity build to run on JBoss AS</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/</url>
+ <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>jbossidm</artifactId>
+ <version>${idm}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-bindings-jboss</artifactId>
+ <version>${idfed}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed</artifactId>
+ <version>${idfed}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <idm>1.0.0.Beta1</idm>
+ <idfed>1.0.0.beta1</idfed>
+ </properties>
+</project>
Deleted: consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-openid/pom.xml 2009-08-24 15:56:16 UTC (rev 732)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,93 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-build-openid</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity dependency pack for OpenID</name>
- <url>http://labs.jboss.org/portal/jbossidentity/</url>
- <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
-
- <dependencies>
-
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.12</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>httpclient</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>bundle-project-sources</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Identity</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Identity</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml (from rev 735, consolidated-build/trunk/identity-build-openid/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-openid/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <version>1.0.0.beta1</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-build-openid</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity dependency pack for OpenID</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/</url>
+ <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-08-24 15:56:16 UTC (rev 732)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,81 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-identity-build-tomcat</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity build to run on Tomcat</name>
- <url>http://labs.jboss.org/portal/jbossidentity/</url>
- <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.identity.idm</groupId>
- <artifactId>jbossidm</artifactId>
- <version>${idm}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-bindings</artifactId>
- <version>${idfed}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-fed</artifactId>
- <version>${idfed}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <executions>
- <execution>
- <id>bundle-project-sources</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>JBoss Identity</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
- <Implementation-Title>JBoss Identity</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
- <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
- <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
- </manifestEntries>
- </archive>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <idm>1.0.0.Beta1</idm>
- <idfed>1.0.0.alpha5</idfed>
- </properties>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml (from rev 735, consolidated-build/trunk/identity-build-tomcat/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/identity-build-tomcat/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <version>1.0.0.beta1</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-identity-build-tomcat</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity build to run on Tomcat</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/</url>
+ <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>jbossidm</artifactId>
+ <version>${idm}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-bindings</artifactId>
+ <version>${idfed}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-fed</artifactId>
+ <version>${idfed}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <executions>
+ <execution>
+ <id>bundle-project-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <idm>1.0.0.Beta1</idm>
+ <idfed>1.0.0.beta1</idfed>
+ </properties>
+</project>
Deleted: consolidated-build/tags/1.0.0.beta1/parent/pom.xml
===================================================================
--- consolidated-build/trunk/parent/pom.xml 2009-08-24 15:56:16 UTC (rev 732)
+++ consolidated-build/tags/1.0.0.beta1/parent/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,118 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <name>JBoss Identity build- Parent</name>
- <url>http://labs.jboss.org/portal/jbossidentity/</url>
- <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.4.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1.9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbossxacml</artifactId>
- <version>2.0.3.SP2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/parent/pom.xml (from rev 735, consolidated-build/trunk/parent/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/parent/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/parent/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,118 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0.beta1</version>
+ <name>JBoss Identity build- Parent</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/</url>
+ <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.4.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1.9</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbossxacml</artifactId>
+ <version>2.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Deleted: consolidated-build/tags/1.0.0.beta1/pom.xml
===================================================================
--- consolidated-build/trunk/pom.xml 2009-08-24 15:56:16 UTC (rev 732)
+++ consolidated-build/tags/1.0.0.beta1/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -1,23 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
- <relativePath>parent</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.identity</groupId>
- <artifactId>jboss-identity-consolidated-pom</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Identity consolidated- Aggregator</name>
- <url>http://labs.jboss.org/portal/jbossidentity/</url>
- <description>JBoss Identity Platform is the identity project for JEMS projects</description>
-
- <modules>
- <module>parent</module>
- <module>identity-build-tomcat</module>
- <module>identity-build-jbas</module>
- <module>identity-build-openid</module>
- <module>identity-build-idm</module>
- </modules>
-</project>
Copied: consolidated-build/tags/1.0.0.beta1/pom.xml (from rev 735, consolidated-build/trunk/pom.xml)
===================================================================
--- consolidated-build/tags/1.0.0.beta1/pom.xml (rev 0)
+++ consolidated-build/tags/1.0.0.beta1/pom.xml 2009-08-24 16:24:44 UTC (rev 736)
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-build-parent</artifactId>
+ <version>1.0.0.beta1</version>
+ <relativePath>parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-consolidated-pom</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity consolidated- Aggregator</name>
+ <url>http://labs.jboss.org/portal/jbossidentity/</url>
+ <description>JBoss Identity Platform is the identity project for JEMS projects</description>
+
+ <modules>
+ <module>parent</module>
+ <module>identity-build-tomcat</module>
+ <module>identity-build-jbas</module>
+ <module>identity-build-openid</module>
+ <module>identity-build-idm</module>
+ </modules>
+</project>
14 years, 8 months
- 1
- 0
JBoss Identity SVN: r735 - in consolidated-build/trunk: identity-build-idm and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-08-24 12:24:23 -0400 (Mon, 24 Aug 2009)
New Revision: 735
Modified:
consolidated-build/trunk/identity-build-idm/pom.xml
consolidated-build/trunk/identity-build-jbas/pom.xml
consolidated-build/trunk/identity-build-openid/pom.xml
consolidated-build/trunk/identity-build-tomcat/pom.xml
consolidated-build/trunk/parent/pom.xml
consolidated-build/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0.beta1
Modified: consolidated-build/trunk/identity-build-idm/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-idm/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/identity-build-idm/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-jbas/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/identity-build-jbas/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-openid/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-openid/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/identity-build-openid/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/identity-build-tomcat/pom.xml
===================================================================
--- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: consolidated-build/trunk/parent/pom.xml
===================================================================
--- consolidated-build/trunk/parent/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/parent/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<name>JBoss Identity build- Parent</name>
<url>http://labs.jboss.org/portal/jbossidentity/</url>
<description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection>
</scm>
<build>
Modified: consolidated-build/trunk/pom.xml
===================================================================
--- consolidated-build/trunk/pom.xml 2009-08-24 16:23:19 UTC (rev 734)
+++ consolidated-build/trunk/pom.xml 2009-08-24 16:24:23 UTC (rev 735)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-build-parent</artifactId>
- <version>1.0.0.alpha5-SNAPSHOT</version>
+ <version>1.0.0.beta1</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 8 months
- 1
- 0