Picketlink SVN: r869 - in picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation: configuration and 1 other directory.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-10 10:39:14 -0400 (Sun, 10 Apr 2011)
New Revision: 869
Modified:
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/RequestContext.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java
Log:
make serializable
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/FacebookLoginReceiver.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -77,7 +77,7 @@
throw new RuntimeException("Return URL parameter not found");
}
String authorizationCode = request.getParameter(OAuthConstants.CODE_PARAMETER);
- if (returnUrl == null)
+ if (authorizationCode == null)
{
throw new RuntimeException("Authorization code parameter not found");
}
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/RequestContext.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/RequestContext.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/RequestContext.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -21,6 +21,8 @@
*/
package org.picketlink.identity.seam.federation;
+import java.io.Serializable;
+
import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider;
/**
@@ -29,8 +31,10 @@
* @author Marcel Kolsteren
* @since Jan 17, 2010
*/
-public class RequestContext
-{
+public class RequestContext implements Serializable
+{
+ private static final long serialVersionUID = 6539143853969747782L;
+
private String id;
private SamlIdentityProvider identityProvider;
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -26,10 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Import;
@@ -38,14 +34,12 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.log.Log;
import org.jboss.seam.util.Base64;
-import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request;
import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
import org.picketlink.identity.federation.core.exceptions.ParsingException;
import org.picketlink.identity.federation.core.exceptions.ProcessingException;
import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.picketlink.identity.federation.core.util.JAXBUtil;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
import org.picketlink.identity.federation.web.util.RedirectBindingUtil;
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -21,14 +21,18 @@
*/
package org.picketlink.identity.seam.federation.configuration;
+import java.io.Serializable;
+
import org.picketlink.identity.federation.core.util.StringUtil;
/**
* @author Marcel Kolsteren
* @since Jan 24, 2010
*/
-public class SamlEndpoint
-{
+public class SamlEndpoint implements Serializable
+{
+ private static final long serialVersionUID = 561425093844469981L;
+
private Binding binding;
private String location;
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.seam.federation.configuration;
+import java.io.Serializable;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.HashMap;
@@ -37,8 +38,10 @@
* @author Marcel Kolsteren
* @since Dec 31, 2009
*/
-public class SamlIdentityProvider
-{
+public class SamlIdentityProvider implements Serializable
+{
+ private static final long serialVersionUID = -8163737777583751528L;
+
private String entityId;
private Map<SamlProfile, SamlService> services = new HashMap<SamlProfile, SamlService>();
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java 2011-04-06 17:35:18 UTC (rev 868)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java 2011-04-10 14:39:14 UTC (rev 869)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.seam.federation.configuration;
+import java.io.Serializable;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
@@ -32,8 +33,10 @@
* @author Marcel Kolsteren
* @since Jan 27, 2010
*/
-public class SamlService
-{
+public class SamlService implements Serializable
+{
+ private static final long serialVersionUID = -7539141845574287939L;
+
private SamlProfile profile;
private List<SamlEndpoint> serviceEndpoints = new LinkedList<SamlEndpoint>();
13 years, 8 months
Picketlink SVN: r868 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-06 13:35:18 -0400 (Wed, 06 Apr 2011)
New Revision: 868
Modified:
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java
Log:
make serializable
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
@@ -44,35 +45,36 @@
* </pre>
*
*
- */
-public class AudienceRestrictionType
-extends ConditionAbstractType
-{
+ */
+public class AudienceRestrictionType extends ConditionAbstractType implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
protected List<URI> audience = new ArrayList<URI>();
/**
* Add an audience
* @param audienceval
*/
- public void addAudience( URI audienceval )
+ public void addAudience(URI audienceval)
{
- audience.add( audienceval );
+ audience.add(audienceval);
}
-
+
/**
* Remove an audience
* @param audienceval
*/
- public void removeAudience( URI audienceval )
+ public void removeAudience(URI audienceval)
{
- audience.remove( audienceval );
+ audience.remove(audienceval);
}
/**
* Gets the value of the audience property.
*/
- public List<URI> getAudience()
- {
- return Collections.unmodifiableList( this.audience );
+ public List<URI> getAudience()
+ {
+ return Collections.unmodifiableList(this.audience);
}
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
/**
@@ -28,12 +29,14 @@
* @author Anil.Saldhana(a)redhat.com
* @since Nov 24, 2010
*/
-public class AuthnContextClassRefType implements URIType
+public class AuthnContextClassRefType implements URIType, Serializable
{
- private URI value;
+ private static final long serialVersionUID = 1L;
- public AuthnContextClassRefType( URI value )
- {
+ private final URI value;
+
+ public AuthnContextClassRefType(URI value)
+ {
this.value = value;
}
@@ -75,5 +78,5 @@
else if (!value.equals(other.value))
return false;
return true;
- }
+ }
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
import java.util.Arrays;
import java.util.Collections;
@@ -28,8 +29,6 @@
import java.util.LinkedHashSet;
import java.util.Set;
-
-
/**
* <p>Java class for AuthnContextType complex type.
*
@@ -61,50 +60,52 @@
* </pre>
*
*
- */
-public class AuthnContextType
-{
- private Set<URI> authenticatingAuthority = new LinkedHashSet<URI>();
+ */
+public class AuthnContextType implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+ private final Set<URI> authenticatingAuthority = new LinkedHashSet<URI>();
+
private AuthnContextTypeSequence sequence;
- private Set<URIType> URITypes = new HashSet<URIType>();
+ private final Set<URIType> URITypes = new HashSet<URIType>();
/**
* Add an authenticating authority
* @param aa {@link URI}
*/
- public void addAuthenticatingAuthority( URI aa )
+ public void addAuthenticatingAuthority(URI aa)
{
- authenticatingAuthority.add( aa );
+ authenticatingAuthority.add(aa);
}
/**
* Add Authenticating Authority
* @param aas an array of {@link URI}
*/
- public void addAuthenticatingAuthority( URI[] aas )
+ public void addAuthenticatingAuthority(URI[] aas)
{
- authenticatingAuthority.addAll( Arrays.asList( aas ) );
+ authenticatingAuthority.addAll(Arrays.asList(aas));
}
/**
* Remove an authenticating authority
* @param aa
*/
- public void removeAuthenticatingAuthority( URI aa )
+ public void removeAuthenticatingAuthority(URI aa)
{
- authenticatingAuthority.remove( aa );
+ authenticatingAuthority.remove(aa);
}
-
+
/**
* Get a read only set of authenticating authority
* @return
*/
public Set<URI> getAuthenticatingAuthority()
{
- return Collections.unmodifiableSet( authenticatingAuthority );
- }
+ return Collections.unmodifiableSet(authenticatingAuthority);
+ }
/**
* Get the sequence
@@ -122,24 +123,24 @@
public void setSequence(AuthnContextTypeSequence sequence)
{
this.sequence = sequence;
- }
+ }
/**
* Add an URI type
* @param aa
*/
- public void addURIType( URIType aa )
+ public void addURIType(URIType aa)
{
- URITypes.add( aa );
+ URITypes.add(aa);
}
/**
* Add an array of URI Type
* @param aas
*/
- public void addURIType( URIType[] aas )
+ public void addURIType(URIType[] aas)
{
- URITypes.addAll( Arrays.asList( aas ) );
+ URITypes.addAll(Arrays.asList(aas));
}
/**
@@ -148,16 +149,16 @@
*/
public Set<URIType> getURIType()
{
- return Collections.unmodifiableSet( URITypes );
+ return Collections.unmodifiableSet(URITypes);
}
-
+
/**
* Add an URI type
* @param aa
*/
- public void removeURIType( URIType aa )
+ public void removeURIType(URIType aa)
{
- URITypes.remove( aa );
+ URITypes.remove(aa);
}
/**
@@ -168,37 +169,41 @@
<element ref="saml:AuthnContextDeclRef"/>
</choice>
</sequence>
- */
+ */
public class AuthnContextTypeSequence
{
private AuthnContextClassRefType classRef;
- private Set<URIType> URITypes = new HashSet<URIType>();
+
+ private final Set<URIType> URITypes = new HashSet<URIType>();
+
public AuthnContextClassRefType getClassRef()
{
return classRef;
}
+
public void setClassRef(AuthnContextClassRefType classRef)
{
this.classRef = classRef;
}
- public void addURIType( URIType aa )
+
+ public void addURIType(URIType aa)
{
- URITypes.add( aa );
+ URITypes.add(aa);
}
-
- public void removeURIType( URIType aa )
+
+ public void removeURIType(URIType aa)
{
- URITypes.remove( aa );
+ URITypes.remove(aa);
}
- public void addURIType( URIType[] aas )
+ public void addURIType(URIType[] aas)
{
- URITypes.addAll( Arrays.asList( aas ) );
+ URITypes.addAll(Arrays.asList(aas));
}
public Set<URIType> getURIType()
{
- return Collections.unmodifiableSet( URITypes );
- }
+ return Collections.unmodifiableSet(URITypes);
+ }
}
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -29,19 +29,21 @@
* @since Nov 24, 2010
*/
public class EncryptedAssertionType extends EncryptedElementType
-{
+{
+ private static final long serialVersionUID = 1L;
+
public EncryptedAssertionType()
{
- super();
+ super();
}
public EncryptedAssertionType(Element el)
{
- super(el);
- }
-
+ super(el);
+ }
+
public String getID()
- {
+ {
return null;
}
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -21,6 +21,8 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
+
import org.w3c.dom.Element;
/**
@@ -28,8 +30,10 @@
* @author Anil.Saldhana(a)redhat.com
* @since Nov 24, 2010
*/
-public class EncryptedElementType
+public class EncryptedElementType implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
/**
<complexType name="EncryptedElementType">
<sequence>
@@ -38,18 +42,18 @@
</sequence>
</complexType>
*/
-
+
protected Element encryptedElement;
public EncryptedElementType()
- {
+ {
}
-
- public EncryptedElementType( Element el)
+
+ public EncryptedElementType(Element el)
{
this.encryptedElement = el;
}
-
+
public Element getEncryptedElement()
{
return encryptedElement;
@@ -58,5 +62,5 @@
public void setEncryptedElement(Element encryptedElement)
{
this.encryptedElement = encryptedElement;
- }
+ }
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -41,9 +41,11 @@
* </pre>
*
*
- */
+ */
public class KeyInfoConfirmationDataType extends SubjectConfirmationDataType
-{
+{
+ private static final long serialVersionUID = 2510471236717847074L;
+
protected Element keyInfo;
public Element getKeyInfo()
@@ -54,5 +56,5 @@
public void setKeyInfo(Element keyInfo)
{
this.keyInfo = keyInfo;
- }
+ }
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +29,6 @@
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
-
/**
* <p>Java class for SubjectConfirmationDataType complex type.
*
@@ -52,18 +52,25 @@
* </pre>
*
*
- */
-public class SubjectConfirmationDataType
-{
- protected XMLGregorianCalendar notBefore;
- protected XMLGregorianCalendar notOnOrAfter;
- protected String recipient;
- protected String inResponseTo;
- protected String address;
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ */
+public class SubjectConfirmationDataType implements Serializable
+{
+ private static final long serialVersionUID = 7695748370849965158L;
- private Object anyType;
+ protected XMLGregorianCalendar notBefore;
+ protected XMLGregorianCalendar notOnOrAfter;
+
+ protected String recipient;
+
+ protected String inResponseTo;
+
+ protected String address;
+
+ private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+ private Object anyType;
+
public Object getAnyType()
{
return anyType;
@@ -82,7 +89,8 @@
* {@link XMLGregorianCalendar }
*
*/
- public XMLGregorianCalendar getNotBefore() {
+ public XMLGregorianCalendar getNotBefore()
+ {
return notBefore;
}
@@ -94,7 +102,8 @@
* {@link XMLGregorianCalendar }
*
*/
- public void setNotBefore(XMLGregorianCalendar value) {
+ public void setNotBefore(XMLGregorianCalendar value)
+ {
this.notBefore = value;
}
@@ -106,7 +115,8 @@
* {@link XMLGregorianCalendar }
*
*/
- public XMLGregorianCalendar getNotOnOrAfter() {
+ public XMLGregorianCalendar getNotOnOrAfter()
+ {
return notOnOrAfter;
}
@@ -118,7 +128,8 @@
* {@link XMLGregorianCalendar }
*
*/
- public void setNotOnOrAfter(XMLGregorianCalendar value) {
+ public void setNotOnOrAfter(XMLGregorianCalendar value)
+ {
this.notOnOrAfter = value;
}
@@ -130,7 +141,8 @@
* {@link String }
*
*/
- public String getRecipient() {
+ public String getRecipient()
+ {
return recipient;
}
@@ -142,7 +154,8 @@
* {@link String }
*
*/
- public void setRecipient(String value) {
+ public void setRecipient(String value)
+ {
this.recipient = value;
}
@@ -154,7 +167,8 @@
* {@link String }
*
*/
- public String getInResponseTo() {
+ public String getInResponseTo()
+ {
return inResponseTo;
}
@@ -166,7 +180,8 @@
* {@link String }
*
*/
- public void setInResponseTo(String value) {
+ public void setInResponseTo(String value)
+ {
this.inResponseTo = value;
}
@@ -178,7 +193,8 @@
* {@link String }
*
*/
- public String getAddress() {
+ public String getAddress()
+ {
return address;
}
@@ -190,7 +206,8 @@
* {@link String }
*
*/
- public void setAddress(String value) {
+ public void setAddress(String value)
+ {
this.address = value;
}
@@ -204,9 +221,9 @@
* @return
* always non-null
*/
- public Map<QName, String> getOtherAttributes()
+ public Map<QName, String> getOtherAttributes()
{
- return Collections.unmodifiableMap( otherAttributes );
+ return Collections.unmodifiableMap(otherAttributes);
}
/**
@@ -214,17 +231,17 @@
* @param qname
* @param str
*/
- public void addOtherAttribute( QName qname, String str )
+ public void addOtherAttribute(QName qname, String str)
{
- otherAttributes.put(qname, str );
+ otherAttributes.put(qname, str);
}
-
+
/**
* Remove an other attribute
* @param qname {@link QName} of the attribute to be removed
*/
- public void removeOtherAttribute( QName qname )
+ public void removeOtherAttribute(QName qname)
{
- otherAttributes.remove( qname );
+ otherAttributes.remove(qname);
}
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java 2011-04-06 16:27:06 UTC (rev 867)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java 2011-04-06 17:35:18 UTC (rev 868)
@@ -26,8 +26,6 @@
import java.util.Collections;
import java.util.List;
-
-
/**
* <p>Java class for SubjectType complex type.
*
@@ -54,14 +52,14 @@
* </pre>
*
*
- */
+ */
public class SubjectType implements Serializable
-{
+{
private static final long serialVersionUID = 1L;
protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>();
- protected STSubType subType;
+ protected STSubType subType;
/**
* Get the {@link STSubType}
@@ -96,35 +94,38 @@
*/
public List<SubjectConfirmationType> getConfirmation()
{
- return Collections.unmodifiableList( subjectConfirmation );
+ return Collections.unmodifiableList(subjectConfirmation);
}
/**
* Add a subject confirmation
* @param con
*/
- public void addConfirmation( SubjectConfirmationType con )
+ public void addConfirmation(SubjectConfirmationType con)
{
- subjectConfirmation.add( con );
- }
+ subjectConfirmation.add(con);
+ }
+
/**
* Remove a subject confirmation
* @param con
*/
- public void removeConfirmation( SubjectConfirmationType con )
+ public void removeConfirmation(SubjectConfirmationType con)
{
- subjectConfirmation.remove( con );
- }
+ subjectConfirmation.remove(con);
+ }
- public static class STSubType
+ public static class STSubType implements Serializable
{
+ private static final long serialVersionUID = -4073731807610876524L;
+
private BaseIDAbstractType baseID;
-
+
private EncryptedElementType encryptedID;
protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>();
- public void addBaseID( BaseIDAbstractType base )
+ public void addBaseID(BaseIDAbstractType base)
{
this.baseID = base;
}
@@ -132,8 +133,8 @@
public BaseIDAbstractType getBaseID()
{
return baseID;
- }
-
+ }
+
public EncryptedElementType getEncryptedID()
{
return encryptedID;
@@ -144,10 +145,10 @@
this.encryptedID = encryptedID;
}
- public void addConfirmation( SubjectConfirmationType con )
+ public void addConfirmation(SubjectConfirmationType con)
{
- subjectConfirmation.add( con );
- }
+ subjectConfirmation.add(con);
+ }
public int getCount()
{
@@ -156,7 +157,7 @@
public List<SubjectConfirmationType> getConfirmation()
{
- return Collections.unmodifiableList( subjectConfirmation );
+ return Collections.unmodifiableList(subjectConfirmation);
}
- }
+ }
}
\ No newline at end of file
13 years, 9 months
Picketlink SVN: r867 - integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-06 12:27:06 -0400 (Wed, 06 Apr 2011)
New Revision: 867
Modified:
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java
Log:
add comments
Modified: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java 2011-04-06 16:25:13 UTC (rev 866)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java 2011-04-06 16:27:06 UTC (rev 867)
@@ -49,34 +49,38 @@
{
private static String username = "UserA";
private static String password = "PassA";
-
+
@SuppressWarnings("rawtypes")
@Test
- public void testWSInteraction() throws Exception {
+ public void testWSInteraction() throws Exception
+ {
+ // Step 1: Get a SAML2 Assertion Token from the STS
WSTrustClient client = new WSTrustClient("PicketLinkSTS", "PicketLinkSTSPort",
"http://localhost:8080/picketlink-sts/PicketLinkSTS",
new SecurityInfo(username, password));
- Element assertion = null;
- try {
- System.out.println("Invoking token service to get SAML assertion for " + username);
- assertion = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE);
- System.out.println("SAML assertion for " + username + " successfully obtained!");
- } catch (WSTrustException wse) {
- System.out.println("Unable to issue assertion: " + wse.getMessage());
- wse.printStackTrace();
- System.exit(1);
- }
+ Element assertion = null;
+ try {
+ System.out.println("Invoking token service to get SAML assertion for " + username);
+ assertion = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE);
+ System.out.println("SAML assertion for " + username + " successfully obtained!");
+ } catch (WSTrustException wse) {
+ System.out.println("Unable to issue assertion: " + wse.getMessage());
+ wse.printStackTrace();
+ System.exit(1);
+ }
- URL wsdl = new URL("http://localhost:8080/picketlink-wstest-tests/WSTestBean?wsdl");
- QName serviceName = new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanService");
- Service service = Service.create(wsdl, serviceName);
- WSTest port = service.getPort(new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanPort"), WSTest.class);
- BindingProvider bp = (BindingProvider)port;
- bp.getRequestContext().put(SAML2Constants.SAML2_ASSERTION_PROPERTY, assertion);
- List<Handler> handlers = bp.getBinding().getHandlerChain();
- handlers.add(new SAML2Handler());
- bp.getBinding().setHandlerChain(handlers);
-
- port.echo("Test");
+ // Step 2: Stuff the Assertion on the SOAP message context and add the SAML2Handler to client side handlers
+ URL wsdl = new URL("http://localhost:8080/picketlink-wstest-tests/WSTestBean?wsdl");
+ QName serviceName = new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanService");
+ Service service = Service.create(wsdl, serviceName);
+ WSTest port = service.getPort(new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanPort"), WSTest.class);
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put(SAML2Constants.SAML2_ASSERTION_PROPERTY, assertion);
+ List<Handler> handlers = bp.getBinding().getHandlerChain();
+ handlers.add(new SAML2Handler());
+ bp.getBinding().setHandlerChain(handlers);
+
+ //Step 3: Access the WS. Exceptions will be thrown anyway.
+ port.echo("Test");
}
}
\ No newline at end of file
13 years, 9 months
Picketlink SVN: r866 - in integration-tests/trunk/picketlink-trust-tests/src/test: java/org/picketlink/test/trust/ws and 3 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-06 12:25:13 -0400 (Wed, 06 Apr 2011)
New Revision: 866
Added:
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSBinaryTokenTestCase.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/TestBean.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/handlers/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/handlers/TestBinaryHandler.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/http/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/http/TestServletRequest.java
integration-tests/trunk/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml
Log:
PLFED-162: test for binary token handler
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSBinaryTokenTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSBinaryTokenTestCase.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSBinaryTokenTestCase.java 2011-04-06 16:25:13 UTC (rev 866)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.tests;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+import org.junit.Test;
+import org.picketlink.test.trust.ws.TestBean;
+import org.picketlink.test.trust.ws.WSTest;
+import org.picketlink.test.trust.ws.handlers.TestBinaryHandler;
+import org.picketlink.test.trust.ws.http.TestServletRequest;
+import org.picketlink.trust.jbossws.handler.BinaryTokenHandler;
+
+/**
+ * Unit Test the {@link BinaryTokenHandler}
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 5, 2011
+ */
+public class STSWSBinaryTokenTestCase
+{
+ /**
+ * This test case does the following.
+ * - We set a Test HttpServletRequest on the soap message context.
+ * - We then inject the {@link BinaryTokenHandler} as a client side handler.
+ * - On the Server Side, we are hitting the {@link TestBean} which is guarded by the {@link TestBinaryHandler}
+ *
+ * The WS has no security. The Server side {@link TestBinaryHandler} ensures that the call comes in with a
+ * BinarySecurityToken
+ *
+ * @throws Exception
+ */
+ @SuppressWarnings("rawtypes")
+ @Test
+ public void testWSInteraction() throws Exception
+ {
+ System.setProperty("binary.http.header", "TEST_HEADER");
+
+ URL wsdl = new URL("http://localhost:8080/picketlink-wstest-tests/TestBean?wsdl");
+ QName serviceName = new QName("http://ws.trust.test.picketlink.org/", "TestBeanService");
+ Service service = Service.create(wsdl, serviceName);
+ WSTest port = service.getPort(new QName("http://ws.trust.test.picketlink.org/", "TestBeanPort"), WSTest.class);
+
+ TestServletRequest request = new TestServletRequest();
+ request.addHeader("TEST_HEADER", "ABCDEFGH");
+
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put(MessageContext.SERVLET_REQUEST, request);
+ List<Handler> handlers = bp.getBinding().getHandlerChain();
+
+ BinaryTokenHandler binaryTokenHandler = new BinaryTokenHandler();
+
+ handlers.add(binaryTokenHandler);
+ bp.getBinding().setHandlerChain(handlers);
+
+ port.echo("Test");
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/TestBean.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/TestBean.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/TestBean.java 2011-04-06 16:25:13 UTC (rev 866)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 5, 2011
+ */
+@Stateless
+@WebService
+@HandlerChain(file="test-binary-handlers.xml")
+public class TestBean implements WSTest
+{
+ @Resource
+ WebServiceContext wsCtx;
+
+ @WebMethod
+ public void echo(String echo)
+ {
+ System.out.println(echo);
+ }
+}
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/handlers/TestBinaryHandler.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/handlers/TestBinaryHandler.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/handlers/TestBinaryHandler.java 2011-04-06 16:25:13 UTC (rev 866)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws.handlers;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+import org.picketlink.trust.jbossws.Constants;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * A Test {@link GenericSOAPHandler} that just verifies that the
+ * SOAP header has a wsse Binary Security Token before letting the call
+ * go through.
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 5, 2011
+ */
+@SuppressWarnings("rawtypes")
+public class TestBinaryHandler extends GenericSOAPHandler
+{
+ private static Set<QName> headers;
+
+ static
+ {
+ HashSet<QName> set = new HashSet<QName>();
+ set.add(Constants.WSSE_HEADER_QNAME);
+ headers = Collections.unmodifiableSet(set);
+ }
+
+ public Set<QName> getHeaders()
+ {
+ //return a collection with just the wsse:Security header to pass the MustUnderstand check on it
+ return headers;
+ }
+
+ @Override
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ SOAPMessageContext soapMessageContext = (SOAPMessageContext) msgContext;
+ SOAPMessage soap = soapMessageContext.getMessage();
+ try
+ {
+ soap.writeTo(System.out);
+ SOAPHeader header = soap.getSOAPHeader();
+ Iterator iter = header.extractAllHeaderElements();
+ if( iter != null)
+ {
+ while(iter.hasNext())
+ {
+ SOAPHeaderElement headerEl = (SOAPHeaderElement) iter.next();
+ if(headerEl.getNodeName().contains(Constants.WSSE_LOCAL))
+ {
+ NodeList nl = headerEl.getChildNodes();
+ for( int i = 0; i < nl.getLength(); i++)
+ {
+ Node n = nl.item(i);
+ if( n.getNodeName().contains(Constants.WSSE_BINARY_SECURITY_TOKEN))
+ return true;
+ }
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return false;
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/http/TestServletRequest.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/http/TestServletRequest.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/http/TestServletRequest.java 2011-04-06 16:25:13 UTC (rev 866)
@@ -0,0 +1,321 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * A Test {@link HttpServletRequest} that just has the headers
+ * that were added via the {@link #addHeader(String, String)} call
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 5, 2011
+ */
+@SuppressWarnings("rawtypes")
+public class TestServletRequest implements HttpServletRequest
+{
+ private Map<String,String> headers = new HashMap<String,String>();
+
+ public void addHeader(String key, String value)
+ {
+ headers.put(key, value);
+ }
+
+ public String getLocalName()
+ {
+ return "localhost";
+ }
+
+ public String getLocalAddr()
+ {
+ return "localhost";
+ }
+ public int getLocalPort()
+ {
+ return 8080;
+ }
+
+ public Object getAttribute(String name)
+ {
+ return null;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return null;
+ }
+
+ public String getCharacterEncoding()
+ {
+ return null;
+ }
+
+ public int getContentLength()
+ {
+ return 0;
+ }
+
+ public String getContentType()
+ {
+ return null;
+ }
+
+ public ServletInputStream getInputStream() throws IOException
+ {
+ return null;
+ }
+
+ public String getParameter(String name)
+ {
+ return null;
+ }
+
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ public Enumeration getLocales()
+ {
+ return null;
+ }
+
+ public Map getParameterMap()
+ {
+ return null;
+ }
+
+ public Enumeration getParameterNames()
+ {
+ return null;
+ }
+
+ public String[] getParameterValues(String name)
+ {
+ return null;
+ }
+
+ public String getProtocol()
+ {
+ return null;
+ }
+
+ public String getScheme()
+ {
+ return null;
+ }
+
+ public String getServerName()
+ {
+ return null;
+ }
+
+ public int getServerPort()
+ {
+ return 0;
+ }
+
+ public BufferedReader getReader() throws IOException
+ {
+ return null;
+ }
+
+ public String getRemoteAddr()
+ {
+ return null;
+ }
+
+ public String getRemoteHost()
+ {
+ return null;
+ }
+
+ public void setAttribute(String name, Object o)
+ {
+ }
+
+ public void removeAttribute(String name)
+ {
+ }
+
+ public boolean isSecure()
+ {
+ return false;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return null;
+ }
+
+ public String getRealPath(String path)
+ {
+ return null;
+ }
+
+ public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
+ {
+ }
+
+ public String getAuthType()
+ {
+ return null;
+ }
+
+ public Cookie[] getCookies()
+ {
+ return null;
+ }
+
+ public long getDateHeader(String name)
+ {
+ return 0;
+ }
+
+ public String getHeader(String name)
+ {
+ return headers.get(name);
+ }
+
+ public Enumeration getHeaders(String name)
+ {
+ return null;
+ }
+
+ public Enumeration getHeaderNames()
+ {
+ return null;
+ }
+
+ public int getIntHeader(String name)
+ {
+ return 0;
+ }
+
+ public String getMethod()
+ {
+ return null;
+ }
+
+ public String getPathInfo()
+ {
+ return null;
+ }
+
+ public String getPathTranslated()
+ {
+ return null;
+ }
+
+ public String getContextPath()
+ {
+ return null;
+ }
+
+ public String getQueryString()
+ {
+ return null;
+ }
+
+ public String getRemoteUser()
+ {
+ return null;
+ }
+
+ public boolean isUserInRole(String role)
+ {
+ return false;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return null;
+ }
+
+ public String getRequestURI()
+ {
+ return null;
+ }
+
+ public StringBuffer getRequestURL()
+ {
+ return null;
+ }
+
+ public String getRequestedSessionId()
+ {
+ return null;
+ }
+
+ public String getServletPath()
+ {
+ return null;
+ }
+
+ public HttpSession getSession(boolean create)
+ {
+ return null;
+ }
+
+ public HttpSession getSession()
+ {
+ return null;
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromURL()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ return false;
+ }
+
+ public int getRemotePort()
+ {
+ return 0;
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/test-binary-handlers.xml 2011-04-06 16:25:13 UTC (rev 866)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+
+
+ <handler-chain>
+ <handler>
+ <handler-name>TestBinaryHandler</handler-name>
+ <handler-class>org.picketlink.test.trust.ws.handlers.TestBinaryHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+
+</handler-chains>
\ No newline at end of file
13 years, 9 months
Picketlink SVN: r865 - integration-tests/trunk/picketlink-trust-tests.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-06 12:24:47 -0400 (Wed, 06 Apr 2011)
New Revision: 865
Modified:
integration-tests/trunk/picketlink-trust-tests/pom.xml
Log:
add servlet dep
Modified: integration-tests/trunk/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-04-06 16:14:24 UTC (rev 864)
+++ integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-04-06 16:24:47 UTC (rev 865)
@@ -79,6 +79,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
<version>2.0.4.SP6</version>
@@ -89,6 +96,12 @@
<artifactId>jbossws-native-core</artifactId>
<version>3.4.1.GA</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
13 years, 9 months
Picketlink SVN: r864 - in trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws: handler and 1 other directory.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-06 12:14:24 -0400 (Wed, 06 Apr 2011)
New Revision: 864
Added:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SecurityActions.java
Log:
PLFED-162: a binary token handler to pick from http header or http cookie
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-04-05 17:22:13 UTC (rev 863)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-04-06 16:14:24 UTC (rev 864)
@@ -27,14 +27,23 @@
/**
* @author Jason T. Greene
+ * @author Anil Saldhana
*/
public class Constants
{
public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...";
+
+ public static final String WSSE_LOCAL = "Security";
public static final String WSSE_PREFIX = "wsse";
public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+
+ public static final String WSSE_BINARY_SECURITY_TOKEN = "BinarySecurityToken";
+
+ public static final String WSSE_ENCODING_TYPE = "EncodingType";
+
+ public static final String WSSE_VALUE_TYPE = "ValueType";
public static final String WSU_PREFIX = "wsu";
Added: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java (rev 0)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-04-06 16:14:24 UTC (rev 864)
@@ -0,0 +1,377 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.trust.jbossws.handler;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.apache.log4j.Logger;
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+import org.picketlink.trust.jbossws.Constants;
+import org.picketlink.trust.jbossws.Util;
+
+/**
+ * <p>
+ * Handler that looks for a binary data that exists
+ * in the HTTP payload either as a header or a cookie
+ * based on configuration.
+ * </p>
+ * <p>
+ * <b>Configuration:</b>
+ * <p>
+ * <i>System Properties:</i>
+ * <ul>
+ * <li>binary.http.header: http header name</li>
+ * <li>binary.http.cookie: http cookie name</li>
+ * <li>binary.http.encodingType: attribute value of the EncodingType attribute</li>
+ * <li>binary.http.valueType: attribute value of the ValueType attribute</li>
+ * <li>binary.http.valueType.namespace: namespace for the ValueType attribute</li>
+ * <li>binary.http.valueType.prefix: namespace for the ValueType attribute</li>
+ * <li>binary.http.cleanToken: true or false dependending on whether the binary token has to be cleaned</li>
+ * </ul>
+ * <i>Setters:</i>
+ * <p> Please see the see also section. </p>
+ *
+ * @see #setHttpHeaderName(String)
+ * @see #setHttpCookieName(String)
+ * @see #setEncodingType(String)
+ * @see #setValueType(String)
+ * @see #setValueTypeNamespace(String)
+ * @see #setValueTypePrefix(String)
+ * @see #setCleanToken(boolean)
+ * </p>
+ * </p>
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 5, 2011
+ */
+@SuppressWarnings("rawtypes")
+public class BinaryTokenHandler extends GenericSOAPHandler
+{
+ protected static Logger log = Logger.getLogger(BinaryTokenHandler.class);
+ protected boolean trace = log.isTraceEnabled();
+
+ private static Set<QName> headers;
+
+ /**
+ * The HTTP header name that this token looks for. Either this or the httpCookieName should be set.
+ */
+ private String httpHeaderName = SecurityActions.getSystemProperty("binary.http.header", null);
+
+ /**
+ * The HTTP cookie name that this token looks for. Either this or the httpHeaderName should be set.
+ */
+ private String httpCookieName = SecurityActions.getSystemProperty("binary.http.cookie", null);
+
+ /**
+ * Attribute value for the EncodingType attribute
+ */
+ private String encodingType = SecurityActions.getSystemProperty("binary.http.encodingType",
+ "http://docs.oasis-open.org/wss/2004/01/ oasis-200401-wss-soap-message-security-1.0#Base64Binary");
+
+ /**
+ * Attribute value for the ValueType attribute
+ */
+ private String valueType = SecurityActions.getSystemProperty("binary.http.valueType", null);
+
+ /**
+ * Namespace for the ValueType. Can be null. If null, then a separate namespace is not added.
+ */
+ private String valueTypeNamespace = SecurityActions.getSystemProperty("binary.http.valueType.namespace", null);
+
+ /**
+ * Prefix for the ValueType. Can be null.
+ */
+ private String valueTypePrefix = SecurityActions.getSystemProperty("binary.http.valueType.prefix", null);
+
+ /**
+ * Some binary tokens need to be cleaned. This handler just cleans upto the first blank space and discards before that.
+ */
+ private boolean cleanToken = Boolean.parseBoolean(SecurityActions.getSystemProperty("binary.http.cleanToken", "false"));
+
+ private SOAPFactory factory = null;
+
+ static
+ {
+ HashSet<QName> set = new HashSet<QName>();
+ set.add(Constants.WSSE_HEADER_QNAME);
+ headers = Collections.unmodifiableSet(set);
+ }
+
+ /**
+ * <p> Set the EncodingType value.</p>
+ * <p> Alternatively, set the system property "binary.http.encodingType"</p>
+ *
+ * @param binaryEncodingType
+ */
+ public void setEncodingType(String binaryEncodingType)
+ {
+ this.encodingType = binaryEncodingType;
+ }
+
+ /**
+ * <p> Set the Value type</p>
+ * <p> Alternatively, set the system property "binary.http.valueType"</p>
+ *
+ * @param binaryValueType
+ */
+ public void setValueType(String binaryValueType)
+ {
+ this.valueType = binaryValueType;
+ }
+
+ /**
+ * <p> Set the ValueType Namespace </p>
+ * <p> Alternatively, set the system property "binary.http.valueType.namespace"</p>
+ *
+ * @param binaryValueNamespace
+ */
+ public void setValueTypeNamespace(String binaryValueNamespace)
+ {
+ this.valueTypeNamespace = binaryValueNamespace;
+ }
+
+ /**
+ * <p> Set the Value Type Prefix </p>
+ * <p> Alternatively, set the system property "binary.http.valueType.prefix" </p>
+ *
+ * @param binaryValuePrefix
+ */
+ public void setValueTypePrefix(String binaryValuePrefix)
+ {
+ this.valueTypePrefix = binaryValuePrefix;
+ }
+
+ public Set<QName> getHeaders()
+ {
+ //return a collection with just the wsse:Security header to pass the MustUnderstand check on it
+ return headers;
+ }
+
+ /**
+ * <p>
+ * Set the Http Header Name
+ * </p>
+ * <p>
+ * Alternatively, set the system property: "binary.http.header"
+ * </p>
+ *
+ * @param http
+ */
+ public void setHttpHeaderName(String http)
+ {
+ httpHeaderName = http;
+ }
+
+ /**
+ * <p>
+ * Set the Http Cookie Name
+ * </p>
+ * <p>
+ * Alternatively, set the system property: ""binary.http.cookie"
+ * </p>
+ *
+ * @param http
+ */
+ public void setHttpCookieName(String http)
+ {
+ httpCookieName = http;
+ }
+
+ /**
+ * <p>
+ * Should we not clean the extracted binary token.
+ * </p>
+ * <p>
+ * Alternatively, set the system property: "binary.http.cleanToken"
+ * </p>
+ *
+ * @param clean
+ */
+ public void setCleanToken( boolean clean)
+ {
+ this.cleanToken = clean;
+ }
+
+ @Override
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ if( httpHeaderName == null && httpCookieName == null )
+ throw new RuntimeException("Either httpHeaderName or httpCookieName should be set" );
+
+ HttpServletRequest servletRequest = getHttpRequest(msgContext);
+ if( servletRequest == null )
+ throw new IllegalStateException("Unable to proceed as Http request is null");
+
+ String token = getTokenValue(servletRequest);
+ if(token==null)
+ throw new IllegalStateException("Null Token");
+ SOAPElement security = null;
+ try
+ {
+ security = create(token);
+ }
+ catch (SOAPException e)
+ {
+ log.error("Unable to create binary token", e);
+ }
+ if( security == null)
+ {
+ log.warn("Was not able to create security token. Just sending message without binary token");
+ return true;
+ }
+ SOAPMessage sm = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPEnvelope envelope;
+ try
+ {
+ envelope = sm.getSOAPPart().getEnvelope();
+ SOAPHeader header = (SOAPHeader)Util.
+ findElement(envelope, new QName(envelope.getNamespaceURI(), "Header"));
+ if (header == null)
+ {
+ header = (SOAPHeader)envelope.getOwnerDocument().createElementNS(
+ envelope.getNamespaceURI(), envelope.getPrefix() + ":Header");
+ envelope.insertBefore(header, envelope.getFirstChild());
+ }
+ header.addChildElement(security);
+ }
+ catch (SOAPException e)
+ {
+ log.error("Unable to create WSSE Binary Header::",e);
+ }
+ return true;
+ }
+
+ /**
+ * Get the {@link HttpServletRequest} from the {@link MessageContext}
+ * @param msgContext
+ * @return
+ */
+ private HttpServletRequest getHttpRequest(MessageContext msgContext)
+ {
+ return (HttpServletRequest) msgContext.get(MessageContext.SERVLET_REQUEST);
+ }
+
+ /**
+ * Given the {@link HttpServletRequest}, look for the http header or
+ * the cookie depending on the configuration
+ * @param http
+ * @return
+ */
+ private String getTokenValue(HttpServletRequest http)
+ {
+ if( httpHeaderName!= null && !httpHeaderName.isEmpty())
+ {
+ String header = http.getHeader(httpHeaderName);
+ if( header != null)
+ return clean(header);
+ }
+ if( httpCookieName != null && !httpCookieName.isEmpty())
+ {
+ Cookie[] cookies = http.getCookies();
+ if( cookies != null )
+ {
+ for(Cookie cookie: cookies)
+ {
+ if(cookie.getName().equals(httpCookieName))
+ {
+ return clean(cookie.getValue());
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Given a binary token, create a {@link SOAPElement}
+ * @param token
+ * @return
+ * @throws SOAPException
+ */
+ private SOAPElement create(String token) throws SOAPException
+ {
+ if(factory == null)
+ factory = SOAPFactory.newInstance();
+ SOAPElement security = factory.createElement(Constants.WSSE_LOCAL, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+
+ if (valueTypeNamespace != null)
+ {
+ security.addNamespaceDeclaration(valueTypePrefix, valueTypeNamespace);
+ }
+
+ SOAPElement binarySecurityToken = factory.
+ createElement(Constants.WSSE_BINARY_SECURITY_TOKEN, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ binarySecurityToken.addTextNode(token);
+ if( valueType != null && !valueType.isEmpty())
+ {
+ binarySecurityToken.setAttribute(Constants.WSSE_VALUE_TYPE, valueType);
+ }
+ if (encodingType != null)
+ {
+ binarySecurityToken.setAttribute(Constants.WSSE_ENCODING_TYPE, encodingType);
+ }
+
+ security.addChildElement(binarySecurityToken);
+ return security;
+ }
+
+ /**
+ * Some 3rd party systems send in the binary token in the format Discardable<space>ValidToken
+ * @param value
+ * @return
+ */
+ private String clean(String value)
+ {
+ if( trace)
+ {
+ log.trace("Cleaning:"+value);
+ }
+ int i= -1;
+
+ if( cleanToken)
+ {
+ value = value.trim();
+ while((i = value.indexOf(' ')) != -1)
+ {
+ value = value.substring(i + 1);
+ }
+ }
+ if(trace)
+ {
+ log.trace("Cleaned:"+value);
+ }
+ return value;
+ }
+}
\ No newline at end of file
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SecurityActions.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SecurityActions.java 2011-04-05 17:22:13 UTC (rev 863)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SecurityActions.java 2011-04-06 16:14:24 UTC (rev 864)
@@ -88,4 +88,21 @@
}
});
}
+
+ /**
+ * Get a system property
+ * @param key the property name
+ * @param defaultValue default value in absence of property
+ * @return
+ */
+ static String getSystemProperty( final String key, final String defaultValue)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<String>()
+ {
+ public String run()
+ {
+ return System.getProperty(key, defaultValue);
+ }
+ });
+ }
}
\ No newline at end of file
13 years, 9 months
Picketlink SVN: r863 - in integration-tests/trunk: ant-scripts and 56 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-05 13:22:13 -0400 (Tue, 05 Apr 2011)
New Revision: 863
Modified:
integration-tests/trunk/
integration-tests/trunk/ant-scripts/
integration-tests/trunk/ant-scripts/ant-build.xml
integration-tests/trunk/common-dist/
integration-tests/trunk/common-dist/jbossas/
integration-tests/trunk/common-dist/jbossas/5.1.0.GA/
integration-tests/trunk/common-dist/jbossas/6.0/
integration-tests/trunk/common-dist/jbossws/
integration-tests/trunk/common-dist/jbossws/3.3.1.GA/
integration-tests/trunk/common-dist/scripts/
integration-tests/trunk/common-dist/tomcat/
integration-tests/trunk/common-dist/tomcat/6.0.26/
integration-tests/trunk/parent/
integration-tests/trunk/picketlink-openid-tests/
integration-tests/trunk/picketlink-openid-tests/src/
integration-tests/trunk/picketlink-openid-tests/src/test/
integration-tests/trunk/picketlink-openid-tests/src/test/java/
integration-tests/trunk/picketlink-openid-tests/src/test/java/org/
integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/
integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test/
integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test/integration/
integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test/integration/openid/
integration-tests/trunk/picketlink-pdp-tests/
integration-tests/trunk/picketlink-pdp-tests/src/
integration-tests/trunk/picketlink-pdp-tests/src/test/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/
integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/
integration-tests/trunk/picketlink-pdp-tests/src/test/resources/
integration-tests/trunk/picketlink-saml-jbas51/
integration-tests/trunk/picketlink-saml-jbas6/
integration-tests/trunk/picketlink-saml-tests/
integration-tests/trunk/picketlink-saml-tests/src/
integration-tests/trunk/picketlink-saml-tests/src/test/
integration-tests/trunk/picketlink-saml-tests/src/test/java/
integration-tests/trunk/picketlink-saml-tests/src/test/java/org/
integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/
integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test/
integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/
integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/
integration-tests/trunk/picketlink-saml-tests/src/test/resources/
integration-tests/trunk/picketlink-saml-tomcat6/
integration-tests/trunk/picketlink-sts-jbas51-cxf/
integration-tests/trunk/picketlink-sts-jbas51-native/
integration-tests/trunk/picketlink-sts-jbas6-cxf/
integration-tests/trunk/picketlink-sts-tests/
integration-tests/trunk/picketlink-sts-tests/src/
integration-tests/trunk/picketlink-sts-tests/src/test/
integration-tests/trunk/picketlink-sts-tests/src/test/java/
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/
integration-tests/trunk/picketlink-sts-tests/src/test/resources/
integration-tests/trunk/picketlink-sts-tests/src/test/resources/keystore/
Log:
svn ig
Property changes on: integration-tests/trunk
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/ant-scripts
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Modified: integration-tests/trunk/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/trunk/ant-scripts/ant-build.xml 2011-04-05 17:20:52 UTC (rev 862)
+++ integration-tests/trunk/ant-scripts/ant-build.xml 2011-04-05 17:22:13 UTC (rev 863)
@@ -105,6 +105,14 @@
<target name="copy-sts-props-jbas6">
<copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS6_DEPLOY}/../conf/"/>
</target>
+
+ <target name="copy-trust-settings-jbas5">
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml" todir="${JBAS5_DEPLOY}/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar" todir="${JBAS5_DEPLOY}/picketlink" />
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties" todir="${JBAS5_DEPLOY}/../conf" />
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties" todir="${JBAS5_DEPLOY}/../conf" />
+ <copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${version}/picketlink-trust-jbossws-${version}.jar" todir="${JBAS5_DEPLOY}/picketlink"/>
+ </target>
<target name="start-jboss" depends="stop-jboss">
<echo>Starting Local 8080 </echo>
Property changes on: integration-tests/trunk/common-dist
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/jbossas
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/jbossas/5.1.0.GA
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/jbossas/6.0
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/jbossws
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/jbossws/3.3.1.GA
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/scripts
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/tomcat
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/common-dist/tomcat/6.0.26
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/parent
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java/org
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test/integration
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-openid-tests/src/test/java/org/picketlink/test/integration/openid
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java/org
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-pdp-tests/src/test/resources
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-jbas51
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-jbas6
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java/org
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test/integration
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tests/src/test/resources
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-saml-tomcat6
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-jbas51-cxf
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-jbas51-native
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-jbas6-cxf
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java/org
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/resources
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-sts-tests/src/test/resources/keystore
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
target-eclipse
.metadata
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
13 years, 9 months
Picketlink SVN: r862 - in integration-tests/trunk: picketlink-trust-jbas51-native and 13 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-05 13:20:52 -0400 (Tue, 05 Apr 2011)
New Revision: 862
Added:
integration-tests/trunk/picketlink-trust-jbas51-native/
integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
integration-tests/trunk/picketlink-trust-tests/
integration-tests/trunk/picketlink-trust-tests/pom.xml
integration-tests/trunk/picketlink-trust-tests/src/
integration-tests/trunk/picketlink-trust-tests/src/test/
integration-tests/trunk/picketlink-trust-tests/src/test/java/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTest.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTestBean.java
integration-tests/trunk/picketlink-trust-tests/src/test/resources/
integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/
integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/handlers.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/
integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties
integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-users.properties
Log:
trust tests
Property changes on: integration-tests/trunk/picketlink-trust-jbas51-native
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,211 @@
+<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.picketlink</groupId>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-trust-jbas51-native</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - Trust - JBoss AS 5.1 - Native Stack</name>
+ <url>http://labs.jboss.org/portal/picketlink/</url>
+ <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</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>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <phase>test</phase>
+ <!-- <skipTests>true</skipTests> -->
+ <testClassesDirectory>${basedir}/../picketlink-trust-tests/target/test-classes</testClassesDirectory>
+ <testResourcesDirectory>${basedir}/../picketlink-trust-tests/target/test-classes</testResourcesDirectory>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/target/jboss-5.1.0.GA/lib/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-core.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-spi.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-native-jaxrpc.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jbossws-common.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/jboss-xml-binding.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/mail.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/wsdl4j.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/wstx.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/jboss-5.1.0.GA/client/policy.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>phase-1</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property name="version" value="${project.version}"/>
+ <property name="depclasspath" refid="maven.dependency.classpath"/>
+ <property name="localRepository" value="${user.home}/.m2/repository"/>
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-jbas5" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-trust-settings-jbas5" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>phase-2</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-trust-jbossws</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.4.SP6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-invoker-adaptor-client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Property changes on: integration-tests/trunk/picketlink-trust-tests
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/pom.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,188 @@
+<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.picketlink</groupId>
+ <artifactId>picketlink-integration-tests-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>picketlink-integration-trust-tests</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) using the PicketLink Trust Framework</name>
+ <url>http://labs.jboss.org/portal/picketlink/</url>
+ <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</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>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>picketlink-wstest</finalName>
+ <excludes>
+ <exclude>**/*jboss-beans.xml</exclude>
+ <exclude>**/*TestCase*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <phase>test</phase>
+ <skipTests>true</skipTests>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-trust-jbossws</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>2.0.4.SP6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ <version>3.4.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-invoker-adaptor-client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>client</classifier>
+ <version>5.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Property changes on: integration-tests/trunk/picketlink-trust-tests/src
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/STSWSClientTestCase.java 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.tests;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+
+import org.junit.Test;
+import org.picketlink.identity.federation.api.wstrust.WSTrustClient;
+import org.picketlink.identity.federation.api.wstrust.WSTrustClient.SecurityInfo;
+import org.picketlink.identity.federation.core.wstrust.WSTrustException;
+import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil;
+import org.picketlink.test.trust.ws.WSTest;
+import org.picketlink.trust.jbossws.SAML2Constants;
+import org.picketlink.trust.jbossws.handler.SAML2Handler;
+import org.w3c.dom.Element;
+
+/**
+ * A Simple WS Test for the SAML Profile of WSS
+ * @author Marcus Moyses
+ * @author Anil Saldhana
+ * @since Oct 3, 2010
+ */
+public class STSWSClientTestCase
+{
+ private static String username = "UserA";
+ private static String password = "PassA";
+
+ @SuppressWarnings("rawtypes")
+ @Test
+ public void testWSInteraction() throws Exception {
+ WSTrustClient client = new WSTrustClient("PicketLinkSTS", "PicketLinkSTSPort",
+ "http://localhost:8080/picketlink-sts/PicketLinkSTS",
+ new SecurityInfo(username, password));
+ Element assertion = null;
+ try {
+ System.out.println("Invoking token service to get SAML assertion for " + username);
+ assertion = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE);
+ System.out.println("SAML assertion for " + username + " successfully obtained!");
+ } catch (WSTrustException wse) {
+ System.out.println("Unable to issue assertion: " + wse.getMessage());
+ wse.printStackTrace();
+ System.exit(1);
+ }
+
+ URL wsdl = new URL("http://localhost:8080/picketlink-wstest-tests/WSTestBean?wsdl");
+ QName serviceName = new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanService");
+ Service service = Service.create(wsdl, serviceName);
+ WSTest port = service.getPort(new QName("http://ws.trust.test.picketlink.org/", "WSTestBeanPort"), WSTest.class);
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put(SAML2Constants.SAML2_ASSERTION_PROPERTY, assertion);
+ List<Handler> handlers = bp.getBinding().getHandlerChain();
+ handlers.add(new SAML2Handler());
+ bp.getBinding().setHandlerChain(handlers);
+
+ port.echo("Test");
+ }
+}
\ No newline at end of file
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTest.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTest.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTest.java 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws;
+
+import javax.ejb.Remote;
+import javax.jws.WebService;
+
+@Remote
+@WebService
+/**
+ * A Simple EJB3 Interface that just echoes a string
+ * @author Marcus Moyses
+ * @since Oct 3, 2010
+ */
+public interface WSTest
+{
+ public void echo(String echo);
+}
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTestBean.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTestBean.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/WSTestBean.java 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws;
+
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+
+
+/**
+ * EJB3 implementation
+ * @author Marcus Moyses
+ * @since Oct 3, 2010
+ */
+@Stateless
+@WebService
+@SecurityDomain("sts")
+@RolesAllowed("testRole")
+@HandlerChain(file="handlers.xml")
+public class WSTestBean implements WSTest
+{
+ @Resource
+ WebServiceContext wsCtx;
+
+ @WebMethod
+ public void echo(String echo) {
+ System.out.println("WSTest: " + echo);
+ System.out.println("Principal: " + wsCtx.getUserPrincipal());
+ System.out.println("Principal.getName(): " + wsCtx.getUserPrincipal().getName());
+ System.out.println("isUserInRole('testRole'): " + wsCtx.isUserInRole("testRole"));
+ }
+}
\ No newline at end of file
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/resources
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- ejb3 test application-policy definition -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="sts">
+ <authentication>
+ <login-module code="org.picketlink.identity.federation.bindings.jboss.auth.SAML2STSLoginModule" flag="required">
+ <module-option name="configFile">sts-config.properties</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
+ <module-option name="usersProperties">sts-users.properties</module-option>
+ <module-option name="rolesProperties">sts-roles.properties</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- ejb3 test application-policy definition -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
+ <module-option name="usersProperties">sts-users.properties</module-option>
+ <module-option name="rolesProperties">sts-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+</deployment>
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/handlers.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/handlers.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/handlers.xml 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+
+
+ <handler-chain>
+ <handler>
+ <handler-name>SAML2Handler</handler-name>
+ <handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</handler-class>
+ </handler>
+ </handler-chain>
+
+
+</handler-chains>
\ No newline at end of file
Property changes on: integration-tests/trunk/picketlink-trust-tests/src/test/resources/props
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,5 @@
+JBoss=STSClient
+UserA=STSClient,testRole,JBossAdmin
+UserB=STSClient
+UserC=STSClient
+admin=JBossAdmin
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-users.properties
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-users.properties (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-users.properties 2011-04-05 17:20:52 UTC (rev 862)
@@ -0,0 +1,5 @@
+JBoss=JBoss
+UserA=PassA
+UserB=PassB
+UserC=PassC
+admin=admin
\ No newline at end of file
13 years, 9 months
Picketlink SVN: r861 - in trust/trunk: jbossws and 10 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-05 13:14:14 -0400 (Tue, 05 Apr 2011)
New Revision: 861
Modified:
trust/trunk/
trust/trunk/jbossws/
trust/trunk/jbossws/.classpath
trust/trunk/jbossws/.project
trust/trunk/jbossws/.settings/
trust/trunk/jbossws/.settings/org.eclipse.jdt.core.prefs
trust/trunk/jbossws/src/
trust/trunk/jbossws/src/main/
trust/trunk/jbossws/src/main/java/
trust/trunk/jbossws/src/main/java/org/
trust/trunk/jbossws/src/main/java/org/picketlink/
trust/trunk/jbossws/src/main/java/org/picketlink/trust/
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/
trust/trunk/parent/
Log:
svn ig
Property changes on: trust/trunk
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Modified: trust/trunk/jbossws/.classpath
===================================================================
--- trust/trunk/jbossws/.classpath 2011-04-05 17:13:30 UTC (rev 860)
+++ trust/trunk/jbossws/.classpath 2011-04-05 17:14:14 UTC (rev 861)
@@ -1,7 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA.jar" sourcepath="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.3/xmlsec-1.4.3.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: trust/trunk/jbossws/.project
===================================================================
--- trust/trunk/jbossws/.project 2011-04-05 17:13:30 UTC (rev 860)
+++ trust/trunk/jbossws/.project 2011-04-05 17:14:14 UTC (rev 861)
@@ -1,23 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>picketlink-trust-jbossws</name>
+ <comment>Integration with JBossWS Native stack</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Property changes on: trust/trunk/jbossws/.settings
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Modified: trust/trunk/jbossws/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trust/trunk/jbossws/.settings/org.eclipse.jdt.core.prefs 2011-04-05 17:13:30 UTC (rev 860)
+++ trust/trunk/jbossws/.settings/org.eclipse.jdt.core.prefs 2011-04-05 17:14:14 UTC (rev 861)
@@ -1,9 +1,9 @@
-#Tue Oct 05 15:54:38 BRT 2010
+#Mon Mar 21 17:03:56 CDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trust/trunk/jbossws/src
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java/org
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java/org/picketlink
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java/org/picketlink/trust
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
Property changes on: trust/trunk/parent
___________________________________________________________________
Added: svn:ignore
+ .settings
target
target-eclipse
eclipse-target
.project
.classpath
.metadata
13 years, 9 months
Picketlink SVN: r860 - in trust/trunk/jbossws/src/main: resources and 1 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-04-05 13:13:30 -0400 (Tue, 05 Apr 2011)
New Revision: 860
Added:
trust/trunk/jbossws/src/main/resources/
trust/trunk/jbossws/src/main/resources/META-INF/
trust/trunk/jbossws/src/main/resources/META-INF/picketlink-jaxws-endpoint-config.xml
Log:
add a standard jaxws config
Added: trust/trunk/jbossws/src/main/resources/META-INF/picketlink-jaxws-endpoint-config.xml
===================================================================
--- trust/trunk/jbossws/src/main/resources/META-INF/picketlink-jaxws-endpoint-config.xml (rev 0)
+++ trust/trunk/jbossws/src/main/resources/META-INF/picketlink-jaxws-endpoint-config.xml 2011-04-05 17:13:30 UTC (rev 860)
@@ -0,0 +1,16 @@
+<endpoint-config>
+ <config-name>SAML WSSecurity Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>SAML WSSecurity Handler</javaee:handler-name>
+ <javaee:handler-class>org.picketlink.trust.jbossws.handler.SAML2Handler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>Recording Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+</endpoint-config>
\ No newline at end of file
13 years, 9 months