Picketlink SVN: r377 - integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts.
by picketlink-commits＠lists.jboss.org
Author: sguilhen(a)redhat.com
Date: 2010-08-11 14:04:54 -0400 (Wed, 11 Aug 2010)
New Revision: 377
Modified:
integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
Log:
PLFED-72: reverted changes made to WSTrustUtil as JAXB already does the Base64 encoding of byte[]
Modified: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2010-08-11 18:02:50 UTC (rev 376)
+++ integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2010-08-11 18:04:54 UTC (rev 377)
@@ -40,7 +40,6 @@
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.util.Base64;
import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
import org.picketlink.identity.federation.core.wstrust.WSTrustUtil;
import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil;
@@ -302,9 +301,8 @@
request.setKeyType(URI.create(WSTrustConstants.KEY_TYPE_PUBLIC));
// include a UseKey section that specifies the certificate in the request.
- byte[] base64EncodedCert = Base64.encodeBytes(certificate.getEncoded()).getBytes();
JAXBElement<byte[]> certElement = new org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory()
- .createX509DataTypeX509Certificate(base64EncodedCert);
+ .createX509DataTypeX509Certificate(certificate.getEncoded());
UseKeyType useKey = new UseKeyType();
useKey.setAny(certElement);
request.setUseKey(useKey);
@@ -575,14 +573,12 @@
Assert.assertEquals("Unexpected key value content type", RSAKeyValueType.class, rsaKeyValueElement
.getDeclaredType());
RSAKeyValueType rsaKeyValue = (RSAKeyValueType) rsaKeyValueElement.getValue();
- byte[] encodedModulus = rsaKeyValue.getModulus();
- byte[] encodedExponent = rsaKeyValue.getExponent();
// reconstruct the public key and check if it matches the public key of the provided certificate.
- BigInteger decodedModulus = new BigInteger(1, Base64.decode(encodedModulus, 0, encodedModulus.length));
- BigInteger decodedExponent = new BigInteger(1, Base64.decode(encodedExponent, 0, encodedExponent.length));
+ BigInteger modulus = new BigInteger(1, rsaKeyValue.getModulus());
+ BigInteger exponent = new BigInteger(1, rsaKeyValue.getExponent());
KeyFactory factory = KeyFactory.getInstance("RSA");
- RSAPublicKeySpec spec = new RSAPublicKeySpec(decodedModulus, decodedExponent);
+ RSAPublicKeySpec spec = new RSAPublicKeySpec(modulus, exponent);
RSAPublicKey genKey = (RSAPublicKey) factory.generatePublic(spec);
Assert.assertEquals("Invalid public key", certificate.getPublicKey(), genKey);
}
@@ -601,8 +597,7 @@
byte[] encodedCertificate = (byte[]) x509CertElement.getValue();
// reconstruct the certificate and check if it matches the provided certificate.
- byte[] decodedCertificate = Base64.decode(encodedCertificate, 0, encodedCertificate.length);
- ByteArrayInputStream byteInputStream = new ByteArrayInputStream(decodedCertificate);
+ ByteArrayInputStream byteInputStream = new ByteArrayInputStream(encodedCertificate);
Assert.assertEquals("Invalid certificate in key info", certificate, CertificateFactory.getInstance("X.509")
.generateCertificate(byteInputStream));
}
14 years, 4 months
- 1
- 0
Picketlink SVN: r376 - in federation/trunk/picketlink-fed-core/src: test/java/org/picketlink/test/identity/federation/core/wstrust and 1 other directory.
by picketlink-commits＠lists.jboss.org
Author: sguilhen(a)redhat.com
Date: 2010-08-11 14:02:50 -0400 (Wed, 11 Aug 2010)
New Revision: 376
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
Log:
PLFED-72: reverted changes made to WSTrustUtil as JAXB already does the Base64 encoding of byte[]
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-08-11 11:24:15 UTC (rev 375)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-08-11 18:02:50 UTC (rev 376)
@@ -47,7 +47,6 @@
import org.apache.xml.security.encryption.XMLCipher;
import org.picketlink.identity.federation.core.config.STSType;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.picketlink.identity.federation.core.util.Base64;
import org.picketlink.identity.federation.core.util.JAXBUtil;
import org.picketlink.identity.federation.core.util.XMLEncryptionUtil;
import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
@@ -445,8 +444,8 @@
KeyInfoType keyInfo = null;
try
{
- // get the certificate Base64 encoding.
- byte[] encodedCert = Base64.encodeBytes(certificate.getEncoded()).getBytes();
+ // don't Base64 encode the certificate - JAXB marshaling performs the encoding.
+ byte[] encodedCert = certificate.getEncoded();
// first create a X509DataType that contains the encoded certificate.
org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory factory = new org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory();
@@ -480,12 +479,12 @@
if (key instanceof RSAPublicKey)
{
RSAPublicKey pubKey = (RSAPublicKey) key;
- byte[] encodedModulus = Base64.encodeBytes(pubKey.getModulus().toByteArray()).getBytes();
- byte[] encodedExponent = Base64.encodeBytes(pubKey.getPublicExponent().toByteArray()).getBytes();
+ byte[] modulus = pubKey.getModulus().toByteArray();
+ byte[] exponent = pubKey.getPublicExponent().toByteArray();
RSAKeyValueType rsaKeyValue = new RSAKeyValueType();
- rsaKeyValue.setModulus(encodedModulus);
- rsaKeyValue.setExponent(encodedExponent);
+ rsaKeyValue.setModulus(modulus);
+ rsaKeyValue.setExponent(exponent);
KeyValueType keyValue = new KeyValueType();
keyValue.getContent().add(factory.createRSAKeyValue(rsaKeyValue));
@@ -494,16 +493,16 @@
else if (key instanceof DSAPublicKey)
{
DSAPublicKey pubKey = (DSAPublicKey) key;
- byte[] encodedP = Base64.encodeBytes(pubKey.getParams().getP().toByteArray()).getBytes();
- byte[] encodedQ = Base64.encodeBytes(pubKey.getParams().getQ().toByteArray()).getBytes();
- byte[] encodedG = Base64.encodeBytes(pubKey.getParams().getG().toByteArray()).getBytes();
- byte[] encodedY = Base64.encodeBytes(pubKey.getY().toByteArray()).getBytes();
+ byte[] P = pubKey.getParams().getP().toByteArray();
+ byte[] Q = pubKey.getParams().getQ().toByteArray();
+ byte[] G = pubKey.getParams().getG().toByteArray();
+ byte[] Y = pubKey.getY().toByteArray();
DSAKeyValueType dsaKeyValue = new DSAKeyValueType();
- dsaKeyValue.setP(encodedP);
- dsaKeyValue.setQ(encodedQ);
- dsaKeyValue.setG(encodedG);
- dsaKeyValue.setY(encodedY);
+ dsaKeyValue.setP(P);
+ dsaKeyValue.setQ(Q);
+ dsaKeyValue.setG(G);
+ dsaKeyValue.setY(Y);
KeyValueType keyValue = new KeyValueType();
keyValue.getContent().add(factory.createDSAKeyValue(dsaKeyValue));
Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2010-08-11 11:24:15 UTC (rev 375)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2010-08-11 18:02:50 UTC (rev 376)
@@ -1,23 +1,19 @@
/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.
+ * JBoss, Home of Professional Open Source. Copyright 2009, 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.identity.federation.core.wstrust;
@@ -51,7 +47,6 @@
import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.picketlink.identity.federation.core.util.Base64;
import org.picketlink.identity.federation.core.wstrust.PicketLinkSTS;
import org.picketlink.identity.federation.core.wstrust.PicketLinkSTSConfiguration;
import org.picketlink.identity.federation.core.wstrust.STSConfiguration;
@@ -163,8 +158,7 @@
*
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testSTSConfiguration() throws Exception
{
@@ -230,9 +224,9 @@
/**
* <p>
- * This tests sends a security token request to PicketLinkSTS custom {@code SpecialTokenProvider}. The returned response
- * is verified to make sure the expected tokens have been returned by the service. The token that is generated in
- * this test looks as follows:
+ * This tests sends a security token request to PicketLinkSTS custom {@code SpecialTokenProvider}. The returned
+ * response is verified to make sure the expected tokens have been returned by the service. The token that is
+ * generated in this test looks as follows:
*
* <pre>
* <token:SpecialToken xmlns:token="http://www.tokens.org" TokenType="http://www.tokens.org/SpecialToken">
@@ -242,8 +236,7 @@
*
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeCustom() throws Exception
{
@@ -266,8 +259,8 @@
/**
* <p>
- * This tests sends a SAMLV2.0 security token request to PicketLinkSTS. This request should be handled by the standard
- * {@code SAML20TokenProvider} and should result in a SAMLV2.0 assertion that looks like the following:
+ * This tests sends a SAMLV2.0 security token request to PicketLinkSTS. This request should be handled by the
+ * standard {@code SAML20TokenProvider} and should result in a SAMLV2.0 assertion that looks like the following:
*
* <pre>
* <saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
@@ -299,8 +292,7 @@
*
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20() throws Exception
{
@@ -328,8 +320,7 @@
* case, the request should be handled by the custom {@code SpecialTokenProvider}.
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeCustomAppliesTo() throws Exception
{
@@ -357,8 +348,7 @@
* case, the request should be handled by the standard {@code SAML20TokenProvider}.
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20AppliesTo() throws Exception
{
@@ -422,9 +412,9 @@
/**
* <p>
- * This test requests a SAMLV2.0 assertion and requires a symmetric key to be used as a proof-of-possession token.
- * As the request doesn't contain any client-specified key, the STS is responsible for generating a random key and
- * use this key as the proof token. The WS-Trust response should contain the STS-generated key.
+ * This test requests a SAMLV2.0 assertion and requires a symmetric key to be used as a proof-of-possession token. As
+ * the request doesn't contain any client-specified key, the STS is responsible for generating a random key and use
+ * this key as the proof token. The WS-Trust response should contain the STS-generated key.
* </p>
*
* @throws Exception if an error occurs while running the test.
@@ -472,8 +462,8 @@
/**
* <p>
- * This test requests a SAMLV2.0 assertion and requires a symmetric key to be used as a proof-of-possession token.
- * In this case, the client supplies a secret key in the WS-Trust request, so the STS should combine the client-
+ * This test requests a SAMLV2.0 assertion and requires a symmetric key to be used as a proof-of-possession token. In
+ * this case, the client supplies a secret key in the WS-Trust request, so the STS should combine the client-
* specified key with the STS-generated key and use this combined key as the proof token. The WS-Trust response
* should include the STS key to allow reconstruction of the combined key and the algorithm used to combine the keys.
* </p>
@@ -494,7 +484,7 @@
clientEntropy.getAny().add(
new org.picketlink.identity.federation.ws.trust.ObjectFactory().createBinarySecret(clientBinarySecret));
- // create a token request specifying the key type, key size, and client entropy.
+ // create a token request specifying the key type, key size, and client entropy.
RequestSecurityToken request = this.createRequest("testcontext", WSTrustConstants.ISSUE_REQUEST, null,
"http://services.testcorp.org/provider2");
request.setKeyType(URI.create(WSTrustConstants.KEY_TYPE_SYMMETRIC));
@@ -540,8 +530,8 @@
/**
* <p>
- * This test requests a SAMLV2.0 assertion and sends a X.509 certificate to be used as the proof-of-possession
- * token. The STS must include the specified certificate in the SAML subject confirmation.
+ * This test requests a SAMLV2.0 assertion and sends a X.509 certificate to be used as the proof-of-possession token.
+ * The STS must include the specified certificate in the SAML subject confirmation.
* </p>
*
* @throws Exception if an error occurs while running the test.
@@ -555,9 +545,8 @@
// include a UseKey section that specifies the certificate in the request.
Certificate certificate = this.getCertificate("keystore/sts_keystore.jks", "testpass", "service1");
- byte[] base64EncodedCert = Base64.encodeBytes(certificate.getEncoded()).getBytes();
JAXBElement<byte[]> certElement = new org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory()
- .createX509DataTypeX509Certificate(base64EncodedCert);
+ .createX509DataTypeX509Certificate(certificate.getEncoded());
UseKeyType useKey = new UseKeyType();
useKey.setAny(certElement);
request.setUseKey(useKey);
@@ -579,10 +568,10 @@
/**
* <p>
- * This test requests a SAMLV2.0 assertion and sends a public key to be used as the proof-of-possession
- * token. The STS must include the specified public key in the SAML subject confirmation.
+ * This test requests a SAMLV2.0 assertion and sends a public key to be used as the proof-of-possession token. The
+ * STS must include the specified public key in the SAML subject confirmation.
* </p>
- *
+ *
* @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20WithPublicKey() throws Exception
@@ -620,8 +609,7 @@
* the assertion validated, checking the validation results.
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20Validate() throws Exception
{
@@ -685,12 +673,11 @@
/**
* <p>
- * This test case first generates a SAMLV2.0 assertion and then sends a WS-Trust renew message to the STS to get
- * the assertion renewed (i.e. get a new assertion with an updated lifetime).
+ * This test case first generates a SAMLV2.0 assertion and then sends a WS-Trust renew message to the STS to get the
+ * assertion renewed (i.e. get a new assertion with an updated lifetime).
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20Renew() throws Exception
{
@@ -747,8 +734,7 @@
* the assertion. A canceled assertion cannot be renewed or considered valid anymore.
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeSAML20Cancel() throws Exception
{
@@ -835,8 +821,7 @@
* security token service.
* </p>
*
- * @throws Exception
- * if an error occurs while running the test.
+ * @throws Exception if an error occurs while running the test.
*/
public void testInvokeUnknownTokenType() throws Exception
{
@@ -1095,10 +1080,8 @@
* SpecialTokenProvider}.
* </p>
*
- * @param baseResponse
- * a reference to the WS-Trust response that was sent by the STS.
- * @throws Exception
- * if one of the validation performed fail.
+ * @param baseResponse a reference to the WS-Trust response that was sent by the STS.
+ * @throws Exception if one of the validation performed fail.
*/
private void validateCustomTokenResponse(BaseRequestSecurityTokenResponse baseResponse) throws Exception
{
@@ -1136,15 +1119,13 @@
* SAML20TokenProvider}.
* </p>
*
- * @param baseResponse
- * a reference to the WS-Trust response that was sent by the STS.
+ * @param baseResponse a reference to the WS-Trust response that was sent by the STS.
* @param context the expected name of the response context.
* @param principal the principal that is expected to be seen in the assertion subject.
* @param confirmationMethod the confirmation method that is expected to be seen in the assertion subject.
* @return the SAMLV2.0 assertion that has been extracted from the response. This object can be used by the test
* methods to perform extra validations depending on the scenario being tested.
- * @throws Exception
- * if an error occurs while performing the validation.
+ * @throws Exception if an error occurs while performing the validation.
*/
private AssertionType validateSAMLAssertionResponse(BaseRequestSecurityTokenResponse baseResponse, String context,
String principal, String confirmationMethod) throws Exception
@@ -1218,7 +1199,7 @@
/**
* <p>
- * Validates the contents of the specified {@code SubjectConfirmationType} when the {@code HOLDER_OF_KEY}
+ * Validates the contents of the specified {@code SubjectConfirmationType} when the {@code HOLDER_OF_KEY}
* confirmation method has been used.
* </p>
*
@@ -1226,7 +1207,7 @@
* @param keyType the type of the proof-of-possession key (Symmetric or Public).
* @param certificate the certificate used in the Public Key scenarios.
* @param usePublicKey {@code true} if the certificate's Public Key was used as the proof-of-possession token;
- * {@code false} otherwise.
+ * {@code false} otherwise.
* @throws Exception if an error occurs while performing the validation.
*/
private void validateHolderOfKeyContents(SubjectConfirmationType subjectConfirmation, String keyType,
@@ -1262,14 +1243,12 @@
assertEquals("Unexpected key value content type", RSAKeyValueType.class, rsaKeyValueElement
.getDeclaredType());
RSAKeyValueType rsaKeyValue = (RSAKeyValueType) rsaKeyValueElement.getValue();
- byte[] encodedModulus = rsaKeyValue.getModulus();
- byte[] encodedExponent = rsaKeyValue.getExponent();
// reconstruct the public key and check if it matches the public key of the provided certificate.
- BigInteger decodedModulus = new BigInteger(1, Base64.decode(encodedModulus, 0, encodedModulus.length));
- BigInteger decodedExponent = new BigInteger(1, Base64.decode(encodedExponent, 0, encodedExponent.length));
+ BigInteger modulus = new BigInteger(1, rsaKeyValue.getModulus());
+ BigInteger exponent = new BigInteger(1, rsaKeyValue.getExponent());
KeyFactory factory = KeyFactory.getInstance("RSA");
- RSAPublicKeySpec spec = new RSAPublicKeySpec(decodedModulus, decodedExponent);
+ RSAPublicKeySpec spec = new RSAPublicKeySpec(modulus, exponent);
RSAPublicKey genKey = (RSAPublicKey) factory.generatePublic(spec);
assertEquals("Invalid public key", certificate.getPublicKey(), genKey);
}
@@ -1287,8 +1266,7 @@
byte[] encodedCertificate = (byte[]) x509CertElement.getValue();
// reconstruct the certificate and check if it matches the provided certificate.
- byte[] decodedCertificate = Base64.decode(encodedCertificate, 0, encodedCertificate.length);
- ByteArrayInputStream byteInputStream = new ByteArrayInputStream(decodedCertificate);
+ ByteArrayInputStream byteInputStream = new ByteArrayInputStream(encodedCertificate);
assertEquals("Invalid certificate in key info", certificate, CertificateFactory.getInstance("X.509")
.generateCertificate(byteInputStream));
}
@@ -1300,14 +1278,10 @@
* Utility method that creates a simple WS-Trust request using the specified information.
* </p>
*
- * @param context
- * a {@code String} that represents the request context.
- * @param requestType
- * a {@code String} that represents the WS-Trust request type.
- * @param tokenType
- * a {@code String} that represents the requested token type.
- * @param appliesToString
- * a {@code String} that represents the URL of a service provider.
+ * @param context a {@code String} that represents the request context.
+ * @param requestType a {@code String} that represents the WS-Trust request type.
+ * @param tokenType a {@code String} that represents the requested token type.
+ * @param appliesToString a {@code String} that represents the URL of a service provider.
* @return the constructed {@code RequestSecurityToken} object.
*/
private RequestSecurityToken createRequest(String context, String requestType, String tokenType,
@@ -1382,14 +1356,14 @@
class TestSTS extends PicketLinkSTS
{
private String configFileName = "sts/picketlink-sts.xml";
-
+
TestSTS()
- {
+ {
}
-
- TestSTS( String configFileName )
+
+ TestSTS(String configFileName)
{
- this.configFileName = configFileName;
+ this.configFileName = configFileName;
}
@Override
@@ -1398,16 +1372,16 @@
InputStream stream;
try
{
- URL configURL = Thread.currentThread().getContextClassLoader().getResource( configFileName );
+ URL configURL = Thread.currentThread().getContextClassLoader().getResource(configFileName);
stream = configURL.openStream();
STSType stsConfig = WSTrustUtil.getSTSConfiguration(stream);
- return new PicketLinkSTSConfiguration(stsConfig);
+ return new PicketLinkSTSConfiguration(stsConfig);
}
catch (Exception e)
{
- throw new RuntimeException( e );
- }
+ throw new RuntimeException(e);
+ }
}
public void setContext(WebServiceContext context)
@@ -1473,8 +1447,7 @@
* Sets the principal to be used in the test case.
* </p>
*
- * @param principal
- * the {@code Principal} to be set.
+ * @param principal the {@code Principal} to be set.
*/
public void setUserPrincipal(Principal principal)
{
Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2010-08-11 11:24:15 UTC (rev 375)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java 2010-08-11 18:02:50 UTC (rev 376)
@@ -39,7 +39,6 @@
import junit.framework.TestCase;
-import org.picketlink.identity.federation.core.util.Base64;
import org.picketlink.identity.federation.core.wstrust.StandardSecurityToken;
import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
import org.picketlink.identity.federation.core.wstrust.WSTrustJAXBFactory;
@@ -252,8 +251,7 @@
JAXBElement<?> x509CertElement = (JAXBElement<?>) x509Data.getX509IssuerSerialOrX509SKIOrX509SubjectName().get(0);
assertEquals("Unexpected X509 data content type", byte[].class, x509CertElement.getDeclaredType());
// certificate should have been encoded to Base64, so we need to decode it first.
- byte[] base64EncodedCert = (byte[]) x509CertElement.getValue();
- byte[] encodedCert = Base64.decode(base64EncodedCert, 0, base64EncodedCert.length);
+ byte[] encodedCert = (byte[]) x509CertElement.getValue();
assertTrue("Invalid encoded certificate found", Arrays.equals(certificate.getEncoded(), encodedCert));
}
14 years, 4 months
- 1
- 0
Picketlink SVN: r375 - in idm/branches/1.1.0: assembly and 18 other directories.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-11 07:24:15 -0400 (Wed, 11 Aug 2010)
New Revision: 375
Modified:
idm/branches/1.1.0/assembly/pom.xml
idm/branches/1.1.0/example/auth-simple/pom.xml
idm/branches/1.1.0/example/auth/pom.xml
idm/branches/1.1.0/example/simple/pom.xml
idm/branches/1.1.0/integration/deployer/pom.xml
idm/branches/1.1.0/integration/jboss5/pom.xml
idm/branches/1.1.0/integration/pom.xml
idm/branches/1.1.0/parent/pom.xml
idm/branches/1.1.0/picketlink-idm-api/pom.xml
idm/branches/1.1.0/picketlink-idm-auth/pom.xml
idm/branches/1.1.0/picketlink-idm-cache/pom.xml
idm/branches/1.1.0/picketlink-idm-common/pom.xml
idm/branches/1.1.0/picketlink-idm-core/pom.xml
idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml
idm/branches/1.1.0/picketlink-idm-docs/pom.xml
idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
idm/branches/1.1.0/picketlink-idm-spi/pom.xml
idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
idm/branches/1.1.0/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: idm/branches/1.1.0/assembly/pom.xml
===================================================================
--- idm/branches/1.1.0/assembly/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/assembly/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/branches/1.1.0/example/auth/pom.xml
===================================================================
--- idm/branches/1.1.0/example/auth/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/example/auth/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<artifactId>example-auth</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication</name>
Modified: idm/branches/1.1.0/example/auth-simple/pom.xml
===================================================================
--- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<artifactId>example-auth-simple</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication (using deployer)</name>
Modified: idm/branches/1.1.0/example/simple/pom.xml
===================================================================
--- idm/branches/1.1.0/example/simple/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/example/simple/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<artifactId>example-simple</artifactId>
<packaging>jar</packaging>
<name>Example - Simple PicketLink IDM Maven2 project</name>
Modified: idm/branches/1.1.0/integration/deployer/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
</parent>
<properties>
Modified: idm/branches/1.1.0/integration/jboss5/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
</parent>
<dependencies>
Modified: idm/branches/1.1.0/integration/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/integration/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: idm/branches/1.1.0/parent/pom.xml
===================================================================
--- idm/branches/1.1.0/parent/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/parent/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<name>PicketLink IDM- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -520,11 +520,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1....</developerConnection>
- <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.5.CR02</url>
- </scm>
</project>
Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: idm/branches/1.1.0/picketlink-idm-docs/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/pom.xml
===================================================================
--- idm/branches/1.1.0/pom.xml 2010-08-11 11:23:32 UTC (rev 374)
+++ idm/branches/1.1.0/pom.xml 2010-08-11 11:24:15 UTC (rev 375)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02</version>
+ <version>1.1.5.CR03-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,9 +14,9 @@
<description />
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.1.5.CR02</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.1.5.CR02</developerConnection>
- <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.5.CR02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-par...</url>
</scm>
<profiles>
14 years, 4 months
- 1
- 0
Picketlink SVN: r374 - idm/tags.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-11 07:23:32 -0400 (Wed, 11 Aug 2010)
New Revision: 374
Added:
idm/tags/1.1.5.CR02/
Log:
[maven-scm] copy for tag 1.1.5.CR02
Copied: idm/tags/1.1.5.CR02 (from rev 373, idm/branches/1.1.0)
14 years, 4 months
- 1
- 0
Picketlink SVN: r373 - in idm/branches/1.1.0: assembly and 18 other directories.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-11 07:23:02 -0400 (Wed, 11 Aug 2010)
New Revision: 373
Modified:
idm/branches/1.1.0/assembly/pom.xml
idm/branches/1.1.0/example/auth-simple/pom.xml
idm/branches/1.1.0/example/auth/pom.xml
idm/branches/1.1.0/example/simple/pom.xml
idm/branches/1.1.0/integration/deployer/pom.xml
idm/branches/1.1.0/integration/jboss5/pom.xml
idm/branches/1.1.0/integration/pom.xml
idm/branches/1.1.0/parent/pom.xml
idm/branches/1.1.0/picketlink-idm-api/pom.xml
idm/branches/1.1.0/picketlink-idm-auth/pom.xml
idm/branches/1.1.0/picketlink-idm-cache/pom.xml
idm/branches/1.1.0/picketlink-idm-common/pom.xml
idm/branches/1.1.0/picketlink-idm-core/pom.xml
idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml
idm/branches/1.1.0/picketlink-idm-docs/pom.xml
idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
idm/branches/1.1.0/picketlink-idm-spi/pom.xml
idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
idm/branches/1.1.0/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.5.CR02
Modified: idm/branches/1.1.0/assembly/pom.xml
===================================================================
--- idm/branches/1.1.0/assembly/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/assembly/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -1,6 +1,4 @@
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm</artifactId>
@@ -10,7 +8,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
@@ -134,9 +132,8 @@
</goals>
<configuration>
<tasks>
- <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
- <ant antfile="scripts/antrun-schema.xml"
- target="create-schema">
+ <property name="maven.runtime.classpath" refid="maven.compile.classpath" />
+ <ant antfile="scripts/antrun-schema.xml" target="create-schema">
</ant>
</tasks>
</configuration>
Modified: idm/branches/1.1.0/example/auth/pom.xml
===================================================================
--- idm/branches/1.1.0/example/auth/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/example/auth/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<artifactId>example-auth</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication</name>
@@ -116,7 +116,7 @@
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<version>1.13</version>
- <dependencies/>
+ <dependencies />
<executions>
<execution>
<id>install</id>
@@ -124,44 +124,38 @@
<configuration>
<tasks>
- <jar destfile="${basedir}/target/classes/simple-populator.jar"
- basedir="${basedir}/target/classes/"
- includes="**/*.class"/>
+ <jar destfile="${basedir}/target/classes/simple-populator.jar" basedir="${basedir}/target/classes/" includes="**/*.class" />
<!-- Exploded -->
<copy todir="${basedir}/target/idm-example-auth-exploded.sar">
- <fileset dir="${basedir}/target/classes"/>
+ <fileset dir="${basedir}/target/classes" />
</copy>
<!-- Packed -->
- <jar destfile="${basedir}/target/idm-example-auth.war"
- basedir="${basedir}/target/classes/idm-example-auth.war"/>
+ <jar destfile="${basedir}/target/idm-example-auth.war" basedir="${basedir}/target/classes/idm-example-auth.war" />
<jar destfile="${basedir}/target/idm-example-auth.sar">
- <fileset dir="${basedir}/target/classes/"
- excludes="idm-example-auth.war/**"/>
- <fileset dir="${basedir}/target/"
- includes="idm-example-auth.war"/>
+ <fileset dir="${basedir}/target/classes/" excludes="idm-example-auth.war/**" />
+ <fileset dir="${basedir}/target/" includes="idm-example-auth.war" />
</jar>
<!--<property name="artifact.to.copy"-->
- <!--value="${basedir}/target/idm-example-auth-exploded.sar"/>-->
+ <!--value="${basedir}/target/idm-example-auth-exploded.sar" />-->
<!--<property name="toArtifact"-->
- <!--value="idm-example-auth.sar-exploded"/>-->
+ <!--value="idm-example-auth.sar-exploded" />-->
- <property name="artifact.to.copy"
- value="${basedir}/target/idm-example-auth.sar"/>
+ <property name="artifact.to.copy" value="${basedir}/target/idm-example-auth.sar" />
<ant antfile="${basedir}/build-deploy.xml">
- <target name="deploy"/>
+ <target name="deploy" />
</ant>
</tasks>
Modified: idm/branches/1.1.0/example/auth-simple/pom.xml
===================================================================
--- idm/branches/1.1.0/example/auth-simple/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/example/auth-simple/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<artifactId>example-auth-simple</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication (using deployer)</name>
Modified: idm/branches/1.1.0/example/simple/pom.xml
===================================================================
--- idm/branches/1.1.0/example/simple/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/example/simple/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -1,7 +1,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm.example</groupId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<artifactId>example-simple</artifactId>
<packaging>jar</packaging>
<name>Example - Simple PicketLink IDM Maven2 project</name>
Modified: idm/branches/1.1.0/integration/deployer/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
</parent>
<properties>
Modified: idm/branches/1.1.0/integration/jboss5/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
</parent>
<dependencies>
Modified: idm/branches/1.1.0/integration/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/integration/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: idm/branches/1.1.0/parent/pom.xml
===================================================================
--- idm/branches/1.1.0/parent/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/parent/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<name>PicketLink IDM- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -521,4 +521,10 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1....</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.5.CR02</url>
+ </scm>
</project>
Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
-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."
+ -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>
Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -83,7 +83,7 @@
-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."
+ -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>
Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,7 +62,7 @@
-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."
+ -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>
Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: idm/branches/1.1.0/picketlink-idm-docs/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-docs/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,7 +55,7 @@
-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."
+ -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>
Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/branches/1.1.0/pom.xml
===================================================================
--- idm/branches/1.1.0/pom.xml 2010-08-10 19:19:23 UTC (rev 372)
+++ idm/branches/1.1.0/pom.xml 2010-08-11 11:23:02 UTC (rev 373)
@@ -1,9 +1,8 @@
-<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">
+<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.idm</groupId>
<artifactId>picketlink-idm-parent</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
+ <version>1.1.5.CR02</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -12,12 +11,13 @@
<packaging>pom</packaging>
<name>PicketLink IDM - Aggregator</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
- <description></description>
+ <description />
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</developerConnection>
- </scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/tags/1.1.5.CR02</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/tags/1.1.5.CR02</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.1.5.CR02</url>
+ </scm>
<profiles>
<profile>
14 years, 4 months
- 1
- 0
Picketlink SVN: r372 - idm/branches/1.1.0/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-10 15:19:23 -0400 (Tue, 10 Aug 2010)
New Revision: 372
Modified:
idm/branches/1.1.0/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
Log:
- fix testcase to be compatible with MSAD
Modified: idm/branches/1.1.0/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
===================================================================
--- idm/branches/1.1.0/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-08-10 19:17:40 UTC (rev 371)
+++ idm/branches/1.1.0/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-08-10 19:19:23 UTC (rev 372)
@@ -128,13 +128,13 @@
begin();
User aaa = session.getPersistenceManager().createUser("aaa");
- session.getAttributesManager().updatePassword(aaa, "bbb");
+ session.getAttributesManager().updatePassword(aaa, "Password2000Toto5");
assertNull(session.getPersistenceManager().findUser("bbb"));
assertNotNull(session.getPersistenceManager().findUser("aaa"));
assertNull(session.getPersistenceManager().findUser("aAa"));
- session.getAttributesManager().validatePassword(new SimpleUser("aAa"), "bbb");
+ session.getAttributesManager().validatePassword(new SimpleUser("aAa"), "Password2000Toto5");
assertNull(session.getPersistenceManager().findUser("aAa"));
14 years, 4 months
- 1
- 0
Picketlink SVN: r371 - idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-10 15:17:40 -0400 (Tue, 10 Aug 2010)
New Revision: 371
Modified:
idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
Log:
- fix testcase to be compatible with MSAD
Modified: idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java
===================================================================
--- idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-08-10 18:24:14 UTC (rev 370)
+++ idm/trunk/picketlink-idm-testsuite/src/test/java/org/picketlink/idm/impl/api/APILDAPTestCase.java 2010-08-10 19:17:40 UTC (rev 371)
@@ -128,13 +128,13 @@
begin();
User aaa = session.getPersistenceManager().createUser("aaa");
- session.getAttributesManager().updatePassword(aaa, "bbb");
+ session.getAttributesManager().updatePassword(aaa, "Password2000Toto5");
assertNull(session.getPersistenceManager().findUser("bbb"));
assertNotNull(session.getPersistenceManager().findUser("aaa"));
assertNull(session.getPersistenceManager().findUser("aAa"));
- session.getAttributesManager().validatePassword(new SimpleUser("aAa"), "bbb");
+ session.getAttributesManager().validatePassword(new SimpleUser("aAa"), "Password2000Toto5");
assertNull(session.getPersistenceManager().findUser("aAa"));
14 years, 4 months
- 1
- 0
Picketlink SVN: r370 - idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-10 14:24:14 -0400 (Tue, 10 Aug 2010)
New Revision: 370
Modified:
idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
Log:
- check if result of database search was case sensitive or not
Modified: idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2010-08-10 18:14:09 UTC (rev 369)
+++ idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2010-08-10 18:24:14 UTC (rev 370)
@@ -677,7 +677,14 @@
throw new IdentityException("Cannot find IdentityObject with name '" + name + "' and type '" + type.getName() + "'", e);
}
- return hibernateObject;
+ // Check result with case sensitive compare:
+ if (hibernateObject != null && hibernateObject.getName().equals(name))
+ {
+
+ return hibernateObject;
+
+ }
+ return null;
}
public IdentityObject findIdentityObject(IdentityStoreInvocationContext ctx, String id) throws IdentityException
14 years, 4 months
- 1
- 0
Picketlink SVN: r369 - idm/branches/1.1.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-10 14:14:09 -0400 (Tue, 10 Aug 2010)
New Revision: 369
Modified:
idm/branches/1.1.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
Log:
- check if result of database search was case sensitive or not
Modified: idm/branches/1.1.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- idm/branches/1.1.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2010-08-10 16:18:35 UTC (rev 368)
+++ idm/branches/1.1.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2010-08-10 18:14:09 UTC (rev 369)
@@ -671,7 +671,14 @@
throw new IdentityException("Cannot find IdentityObject with name '" + name + "' and type '" + type.getName() + "'", e);
}
- return hibernateObject;
+ // Check result with case sensitive compare:
+ if (hibernateObject != null && hibernateObject.getName().equals(name))
+ {
+
+ return hibernateObject;
+
+ }
+ return null;
}
public IdentityObject findIdentityObject(IdentityStoreInvocationContext ctx, String id) throws IdentityException
14 years, 4 months
- 1
- 0
Picketlink SVN: r368 - in idm/branches/1.1.0: assembly and 13 other directories.
by picketlink-commits＠lists.jboss.org
Author: bdaw
Date: 2010-08-10 12:18:35 -0400 (Tue, 10 Aug 2010)
New Revision: 368
Modified:
idm/branches/1.1.0/assembly/pom.xml
idm/branches/1.1.0/integration/deployer/pom.xml
idm/branches/1.1.0/integration/jboss5/pom.xml
idm/branches/1.1.0/integration/pom.xml
idm/branches/1.1.0/parent/pom.xml
idm/branches/1.1.0/picketlink-idm-api/pom.xml
idm/branches/1.1.0/picketlink-idm-auth/pom.xml
idm/branches/1.1.0/picketlink-idm-cache/pom.xml
idm/branches/1.1.0/picketlink-idm-common/pom.xml
idm/branches/1.1.0/picketlink-idm-core/pom.xml
idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
idm/branches/1.1.0/picketlink-idm-spi/pom.xml
idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
idm/branches/1.1.0/pom.xml
Log:
- cleanup poms
Modified: idm/branches/1.1.0/assembly/pom.xml
===================================================================
--- idm/branches/1.1.0/assembly/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/assembly/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm</artifactId>
- <version>1.1.5.CR02-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PicketLink IDM Assembly </name>
@@ -19,7 +18,6 @@
<hibernate-commons-annotations>3.1.0.GA</hibernate-commons-annotations>
<hibernate-tools-version>3.2.0.ga</hibernate-tools-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
- <idm.version>${project.version}</idm.version>
<apache.ant.version>1.7.0</apache.ant.version>
<mysql.connector.version>5.0.8</mysql.connector.version>
<postgresql.version>8.3-603.jdbc3</postgresql.version>
@@ -31,56 +29,56 @@
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-api</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-common</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-spi</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-core</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-hibernate</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-ldap</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-cache</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5</artifactId>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5-deployer</artifactId>
<classifier>config</classifier>
<type>zip</type>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5-deployer</artifactId>
<classifier>deployer</classifier>
<type>zip</type>
- <version>${idm.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: idm/branches/1.1.0/integration/deployer/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/integration/deployer/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -4,12 +4,9 @@
<name>PicketLink IDM Integration JBoss5 deployer</name>
<description>PicketLink IDM JBoss5 deployer</description>
-
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5-deployer</artifactId>
<packaging>jar</packaging>
- <version>1.1.5.CR02-SNAPSHOT</version>
-
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
Modified: idm/branches/1.1.0/integration/jboss5/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/integration/jboss5/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -4,12 +4,9 @@
<name>PicketLink IDM Integration JBoss5</name>
<description>PicketLink IDM JBoss5</description>
-
<groupId>org.picketlink.idm.integration</groupId>
<artifactId>picketlink-idm-jboss5</artifactId>
<packaging>jar</packaging>
- <version>1.1.5.CR02-SNAPSHOT</version>
-
<parent>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
Modified: idm/branches/1.1.0/integration/pom.xml
===================================================================
--- idm/branches/1.1.0/integration/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/integration/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -4,7 +4,6 @@
<name>PicketLink IDM Integration</name>
<description>PicketLink IDM Integration</description>
-
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-integration</artifactId>
<packaging>pom</packaging>
@@ -19,7 +18,7 @@
<modules>
<module>jboss5</module>
- <module>deployer</module>
+ <module>deployer</module>
</modules>
<!-- Plugins -->
Modified: idm/branches/1.1.0/parent/pom.xml
===================================================================
--- idm/branches/1.1.0/parent/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/parent/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -22,20 +22,10 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/idm/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/idm/trunk</developerConnection>
- </scm>
<build>
<plugins>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossidentity/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
Modified: idm/branches/1.1.0/picketlink-idm-api/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-api/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
<groupId>org.picketlink.idm</groupId>
Modified: idm/branches/1.1.0/picketlink-idm-auth/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-auth/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
<groupId>org.picketlink.idm</groupId>
Modified: idm/branches/1.1.0/picketlink-idm-cache/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-cache/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/picketlink-idm-common/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-common/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,7 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/idm/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/idm/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/idm/trunk</url>
- </scm>
+
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/picketlink-idm-core/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-core/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-hibernate/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/picketlink-idm-ldap/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-ldap/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/picketlink-idm-spi/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-spi/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,7 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
+
<dependencies>
<dependency>
<groupId>org.picketlink.idm</groupId>
Modified: idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml
===================================================================
--- idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/picketlink-idm-testsuite/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -21,11 +21,6 @@
<name>JBoss Inc.</name>
<url>http://www.jboss.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/jbossidentity/trunk</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossidentity/trunk</url>
- </scm>
<dependencies>
<dependency>
Modified: idm/branches/1.1.0/pom.xml
===================================================================
--- idm/branches/1.1.0/pom.xml 2010-08-10 15:52:01 UTC (rev 367)
+++ idm/branches/1.1.0/pom.xml 2010-08-10 16:18:35 UTC (rev 368)
@@ -14,6 +14,11 @@
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description></description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/idm/branches/1.1.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/idm/branches/1.1.0</developerConnection>
+ </scm>
+
<profiles>
<profile>
<id>default</id>
@@ -36,6 +41,15 @@
</modules>
</profile>
<profile>
+ <id>all</id>
+ <modules>
+ <module>example/simple</module>
+ <module>example/auth</module>
+ <module>example/auth-simple</module>
+ <module>assembly</module>
+ </modules>
+ </profile>
+ <profile>
<id>examples</id>
<modules>
<module>example/simple</module>
14 years, 4 months
- 1
- 0