JBoss Identity SVN: r355 - identity-doc.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-27 15:49:29 -0500 (Fri, 27 Feb 2009)
New Revision: 355
Added:
identity-doc/tags/
Log:
tags dir
15 years, 2 months
JBoss Identity SVN: r354 - in identity-doc/trunk: DeveloperGuide and 3 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-27 15:48:34 -0500 (Fri, 27 Feb 2009)
New Revision: 354
Modified:
identity-doc/trunk/DeveloperGuide/pom.xml
identity-doc/trunk/UserGuide/pom.xml
identity-doc/trunk/assembly/pom.xml
identity-doc/trunk/parent/pom.xml
identity-doc/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0.alpha2
Modified: identity-doc/trunk/DeveloperGuide/pom.xml
===================================================================
--- identity-doc/trunk/DeveloperGuide/pom.xml 2009-02-26 22:31:20 UTC (rev 353)
+++ identity-doc/trunk/DeveloperGuide/pom.xml 2009-02-27 20:48:34 UTC (rev 354)
@@ -2,12 +2,12 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-doc-parent</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Developer-Guide-${translation}</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<packaging>jdocbook</packaging>
<name>Developer Guide (${translation})</name>
Modified: identity-doc/trunk/UserGuide/pom.xml
===================================================================
--- identity-doc/trunk/UserGuide/pom.xml 2009-02-26 22:31:20 UTC (rev 353)
+++ identity-doc/trunk/UserGuide/pom.xml 2009-02-27 20:48:34 UTC (rev 354)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-doc-parent</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>User-Guide-${translation}</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<packaging>jdocbook</packaging>
<name>User Guide (${translation})</name>
Modified: identity-doc/trunk/assembly/pom.xml
===================================================================
--- identity-doc/trunk/assembly/pom.xml 2009-02-26 22:31:20 UTC (rev 353)
+++ identity-doc/trunk/assembly/pom.xml 2009-02-27 20:48:34 UTC (rev 354)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-doc-parent</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: identity-doc/trunk/parent/pom.xml
===================================================================
--- identity-doc/trunk/parent/pom.xml 2009-02-26 22:31:20 UTC (rev 353)
+++ identity-doc/trunk/parent/pom.xml 2009-02-27 20:48:34 UTC (rev 354)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-doc-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<name>JBoss Identity Doc- Parent</name>
<url>http://labs.jboss.org/portal/jbossidentity/</url>
<description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/identity-doc/tags/1....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-doc/tags/1.0.0...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/identity-doc/tags/1....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/identity-doc/tags/1.0.0...</developerConnection>
</scm>
<build>
<plugins>
Modified: identity-doc/trunk/pom.xml
===================================================================
--- identity-doc/trunk/pom.xml 2009-02-26 22:31:20 UTC (rev 353)
+++ identity-doc/trunk/pom.xml 2009-02-27 20:48:34 UTC (rev 354)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>jboss-identity-doc-parent</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.identity.docs</groupId>
<artifactId>jboss-identity-docs</artifactId>
- <version>1.0.0.alpha1-SNAPSHOT</version>
+ <version>1.0.0.alpha2</version>
<packaging>pom</packaging>
<name>JBoss Identity Docs</name>
<url>http://www.jboss.com/products/jbossidentity</url>
15 years, 2 months
JBoss Identity SVN: r353 - in identity-doc/trunk: DeveloperGuide and 10 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-26 17:31:20 -0500 (Thu, 26 Feb 2009)
New Revision: 353
Modified:
identity-doc/trunk/
identity-doc/trunk/DeveloperGuide/
identity-doc/trunk/DeveloperGuide/src/
identity-doc/trunk/DeveloperGuide/src/main/
identity-doc/trunk/DeveloperGuide/src/main/docbook/
identity-doc/trunk/UserGuide/
identity-doc/trunk/UserGuide/src/
identity-doc/trunk/UserGuide/src/main/
identity-doc/trunk/UserGuide/src/main/docbook/
identity-doc/trunk/assembly/
identity-doc/trunk/images/
identity-doc/trunk/parent/
Log:
recursively set svn ignore
Property changes on: identity-doc/trunk
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/DeveloperGuide
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/DeveloperGuide/src
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/DeveloperGuide/src/main
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/DeveloperGuide/src/main/docbook
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/UserGuide
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/UserGuide/src
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/UserGuide/src/main
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/UserGuide/src/main/docbook
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/assembly
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/images
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
Property changes on: identity-doc/trunk/parent
___________________________________________________________________
Name: svn:ignore
- .project .classpath target target-eclipse .metadata
+ .classpath
.project
.metadata
target
target-eclipse
15 years, 2 months
JBoss Identity SVN: r352 - in identity-doc/trunk: UserGuide/src/main/docbook and 1 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-26 17:21:56 -0500 (Thu, 26 Feb 2009)
New Revision: 352
Added:
identity-doc/trunk/assembly/
identity-doc/trunk/assembly/bin.xml
identity-doc/trunk/assembly/pom.xml
Modified:
identity-doc/trunk/UserGuide/src/main/docbook/UserGuide.xml
identity-doc/trunk/pom.xml
Log:
add assembly module to zip
Modified: identity-doc/trunk/UserGuide/src/main/docbook/UserGuide.xml
===================================================================
--- identity-doc/trunk/UserGuide/src/main/docbook/UserGuide.xml 2009-02-26 20:53:50 UTC (rev 351)
+++ identity-doc/trunk/UserGuide/src/main/docbook/UserGuide.xml 2009-02-26 22:21:56 UTC (rev 352)
@@ -712,6 +712,14 @@
</section> <!-- End: Configure the SP -->
</chapter> <!-- Web SSO (XML Signature Support) -->
+
+ <chapter>
+ <section>
+ <title>
+ Web SSO (XML Encryption Support)
+ </title>
+ </section>
+ </chapter>
</part> <!-- End Section: Advanced Usage -->
<part> <!-- Troubleshooting -->
@@ -852,6 +860,11 @@
</para>
<para>
<ulink
+ url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=305">
+ JBoss Identity User Forum</ulink>
+ </para>
+ <para>
+ <ulink
url="http://www.jboss.com/index.html?module=bb&c=32">
JBoss Identity Design Forum</ulink>
</para>
Added: identity-doc/trunk/assembly/bin.xml
===================================================================
--- identity-doc/trunk/assembly/bin.xml (rev 0)
+++ identity-doc/trunk/assembly/bin.xml 2009-02-26 22:21:56 UTC (rev 352)
@@ -0,0 +1,16 @@
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../DeveloperGuide/target/docbook/publish</directory>
+ <outputDirectory>/DeveloperGuide</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../UserGuide/target/docbook/publish</directory>
+ <outputDirectory>/UserGuide</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: identity-doc/trunk/assembly/pom.xml
===================================================================
--- identity-doc/trunk/assembly/pom.xml (rev 0)
+++ identity-doc/trunk/assembly/pom.xml 2009-02-26 22:21:56 UTC (rev 352)
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-doc-parent</artifactId>
+ <version>1.0.0.alpha1-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.identity</groupId>
+ <artifactId>jboss-identity-doc</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Identity Federation- Assembly</name>
+ <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+ <description>JBoss Identity doc</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-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>JBoss Identity</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor>
+ <Implementation-Title>JBoss Identity</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-VendorId>org.jboss.security</Implementation-VendorId>
+ <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor>
+ <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: identity-doc/trunk/pom.xml
===================================================================
--- identity-doc/trunk/pom.xml 2009-02-26 20:53:50 UTC (rev 351)
+++ identity-doc/trunk/pom.xml 2009-02-26 22:21:56 UTC (rev 352)
@@ -18,5 +18,6 @@
<module>parent</module>
<module>DeveloperGuide</module>
<module>UserGuide</module>
+ <module>assembly</module>
</modules>
</project>
15 years, 2 months
JBoss Identity SVN: r351 - in identity-federation/trunk/identity-fed-api: src/main/java/org/jboss/identity/federation/api/util and 1 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-26 15:53:50 -0500 (Thu, 26 Feb 2009)
New Revision: 351
Modified:
identity-federation/trunk/identity-fed-api/.classpath
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLEncryptionUtil.java
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java
Log:
XMLEnc updates
Modified: identity-federation/trunk/identity-fed-api/.classpath
===================================================================
--- identity-federation/trunk/identity-fed-api/.classpath 2009-02-26 20:53:23 UTC (rev 350)
+++ identity-federation/trunk/identity-fed-api/.classpath 2009-02-26 20:53:50 UTC (rev 351)
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry excluding="**/*.java|endorsed/*jar" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
@@ -19,5 +19,10 @@
<classpathentry combineaccessrules="false" kind="src" path="/identity-fed-model"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
+ <classpathentry kind="lib" path="src/test/resources/endorsed/resolver.jar"/>
+ <classpathentry kind="lib" path="src/test/resources/endorsed/serializer.jar"/>
+ <classpathentry kind="lib" path="src/test/resources/endorsed/xalan.jar"/>
+ <classpathentry kind="lib" path="src/test/resources/endorsed/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="src/test/resources/endorsed/xml-apis.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLEncryptionUtil.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLEncryptionUtil.java 2009-02-26 20:53:23 UTC (rev 350)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLEncryptionUtil.java 2009-02-26 20:53:50 UTC (rev 351)
@@ -48,9 +48,13 @@
*/
public class XMLEncryptionUtil
{
+ public static final String CIPHER_DATA_LOCALNAME = "CipherData";
+ public static final String ENCRYPTED_KEY_LOCALNAME = "EncryptedKey";
+ public static final String DS_KEY_INFO = "ds:KeyInfo";
+
public static final String XMLNS = "http://www.w3.org/2000/xmlns/";
- private static String XMLSIG_NS = JBossSAMLURIConstants.XMLDSIG_NSURI.get();
- private static String XMLENC_NS = JBossSAMLURIConstants.XMLENC_NSURI.get();
+ public static String XMLSIG_NS = JBossSAMLURIConstants.XMLDSIG_NSURI.get();
+ public static String XMLENC_NS = JBossSAMLURIConstants.XMLENC_NSURI.get();
static
{
@@ -91,7 +95,104 @@
}
/**
- * Encrypt an element inside a Document.
+ * Given an element in a Document, encrypt the element and replace
+ * the element in the document with the encrypted data
+ * @param elementQName QName of the element that we like to encrypt
+ * @param publicKey
+ * @param secretKey
+ * @param keySize
+ * @param wrappingElementQName A QName of an element that will wrap the encrypted element
+ * @param addEncryptedKeyInKeyInfo Need for the EncryptedKey to be placed in ds:KeyInfo
+ * @return
+ * @throws Exception
+ */
+ public static void encryptElement(QName elementQName,
+ Document document,
+ PublicKey publicKey,
+ SecretKey secretKey, int keySize, QName wrappingElementQName,
+ boolean addEncryptedKeyInKeyInfo) throws Exception
+ {
+ if(elementQName == null)
+ throw new IllegalArgumentException("elementQName is null");
+ if(document == null)
+ throw new IllegalArgumentException("document is null");
+ String wrappingElementPrefix = wrappingElementQName.getPrefix();
+ if(wrappingElementPrefix == null || wrappingElementPrefix == "")
+ throw new IllegalArgumentException("Wrapping element prefix invalid");
+
+ NodeList elements = document.getElementsByTagName(elementQName.toString());
+ if(elements == null || elements.getLength() > 1)
+ throw new IllegalStateException("Element was either null or more than one:"+elements);
+ Element documentElement = (Element) elements.item(0);
+
+ if(documentElement == null)
+ throw new IllegalStateException("Element could not be found in the document:"+ elementQName.toString());
+
+ XMLCipher cipher = null;
+ EncryptedKey encryptedKey = encryptKey(document, secretKey, publicKey, keySize);
+
+ String encryptionAlgorithm = getXMLEncryptionURL(secretKey.getAlgorithm(), keySize);
+ //Encrypt the Document
+ cipher = XMLCipher.getInstance(encryptionAlgorithm);
+ cipher.init(XMLCipher.ENCRYPT_MODE, secretKey);
+
+ Document encryptedDoc = cipher.doFinal(document, documentElement);
+
+ // The EncryptedKey element is added
+ Element encryptedKeyElement = cipher.martial(document, encryptedKey);
+
+ String wrappingElementName = wrappingElementPrefix + ":" + wrappingElementQName.getLocalPart();
+
+ //Create the wrapping element and set its attribute NS
+ Element wrappingElement = encryptedDoc.createElementNS(wrappingElementQName.getNamespaceURI(),
+ wrappingElementName);
+
+ if(wrappingElementPrefix == null || wrappingElementPrefix == "")
+ {
+ wrappingElementName = wrappingElementQName.getLocalPart();
+ }
+ wrappingElement.setAttributeNS(XMLNS,
+ "xmlns:" + wrappingElementPrefix, wrappingElementQName.getNamespaceURI());
+
+ //Get Hold of the Cipher Data
+ NodeList cipherElements = encryptedDoc.getElementsByTagNameNS(XMLENC_NS, "EncryptedData");
+ if(cipherElements == null || cipherElements.getLength() == 0)
+ throw new IllegalStateException("xenc:EncryptedData Element Missing");
+ Element encryptedDataElement = (Element) cipherElements.item(0);
+
+ Node parentOfEncNode = encryptedDataElement.getParentNode();
+ parentOfEncNode.replaceChild(wrappingElement, encryptedDataElement);
+
+ wrappingElement.appendChild(encryptedDataElement);
+
+ if (addEncryptedKeyInKeyInfo)
+ {
+ // Outer ds:KeyInfo Element to hold the EncryptionKey
+ Element sigElement = encryptedDoc.createElementNS(XMLSIG_NS, DS_KEY_INFO);
+ sigElement.setAttributeNS(XMLNS, "xmlns:ds", XMLSIG_NS);
+ sigElement.appendChild(encryptedKeyElement);
+
+ //Insert the Encrypted key before the CipherData element
+ NodeList nodeList = encryptedDoc.getElementsByTagNameNS(XMLENC_NS, CIPHER_DATA_LOCALNAME);
+ if (nodeList == null || nodeList.getLength() == 0)
+ throw new IllegalStateException("xenc:CipherData Element Missing");
+ Element cipherDataElement = (Element) nodeList.item(0);
+ Node cipherParent = cipherDataElement.getParentNode();
+ cipherParent.insertBefore(sigElement, cipherDataElement);
+ }
+ else
+ {
+ //Add the encrypted key as a child of the wrapping element
+ wrappingElement.appendChild(encryptedKeyElement);
+ }
+ }
+
+
+ /**
+ * Encrypt the root document element inside a Document.
+ * <b>NOTE:</> The document root element will be replaced
+ * by the wrapping element.
+ *
* @param document Document that contains an element to encrypt
* @param publicKey The Public Key used to encrypt the secret encryption key
* @param secretKey The secret encryption key
@@ -103,10 +204,15 @@
* @return An element that has the wrappingElementQName
* @throws Exception
*/
- public static Element encryptElementInDocument(Document document, PublicKey publicKey,
+ public static Element encryptElementInDocument(Document document,
+ PublicKey publicKey,
SecretKey secretKey, int keySize, QName wrappingElementQName,
boolean addEncryptedKeyInKeyInfo) throws Exception
{
+ String wrappingElementPrefix = wrappingElementQName.getPrefix();
+ if(wrappingElementPrefix == null || wrappingElementPrefix == "")
+ throw new IllegalArgumentException("Wrapping element prefix invalid");
+
XMLCipher cipher = null;
EncryptedKey encryptedKey = encryptKey(document, secretKey, publicKey, keySize);
@@ -120,12 +226,18 @@
// The EncryptedKey element is added
Element encryptedKeyElement = cipher.martial(document, encryptedKey);
+ String wrappingElementName = wrappingElementPrefix + ":" + wrappingElementQName.getLocalPart();
+
//Create the wrapping element and set its attribute NS
Element wrappingElement = encryptedDoc.createElementNS(wrappingElementQName.getNamespaceURI(),
- wrappingElementQName.getPrefix() + ":" + wrappingElementQName.getLocalPart());
+ wrappingElementName);
+ if(wrappingElementPrefix == null || wrappingElementPrefix == "")
+ {
+ wrappingElementName = wrappingElementQName.getLocalPart();
+ }
wrappingElement.setAttributeNS(XMLNS,
- "xmlns:" + wrappingElementQName.getPrefix(), wrappingElementQName.getNamespaceURI());
+ "xmlns:" + wrappingElementPrefix, wrappingElementQName.getNamespaceURI());
Element encryptedDocRootElement = encryptedDoc.getDocumentElement();
//Bring in the encrypted wrapping element to wrap the root node
@@ -136,13 +248,13 @@
if (addEncryptedKeyInKeyInfo)
{
// Outer ds:KeyInfo Element to hold the EncryptionKey
- Element sigElement = encryptedDoc.createElementNS(XMLSIG_NS, "ds:KeyInfo");
+ Element sigElement = encryptedDoc.createElementNS(XMLSIG_NS, DS_KEY_INFO);
sigElement.setAttributeNS(XMLNS, "xmlns:ds", XMLSIG_NS);
sigElement.appendChild(encryptedKeyElement);
//Insert the Encrypted key before the CipherData element
- NodeList nodeList = encryptedDocRootElement.getElementsByTagNameNS(XMLENC_NS, "CipherData");
- if ((nodeList == null) || (nodeList.getLength() == 0))
+ NodeList nodeList = encryptedDocRootElement.getElementsByTagNameNS(XMLENC_NS, CIPHER_DATA_LOCALNAME);
+ if (nodeList == null || nodeList.getLength() == 0)
throw new IllegalStateException("xenc:CipherData Element Missing");
Element cipherDataElement = (Element) nodeList.item(0);
@@ -155,9 +267,8 @@
}
return encryptedDoc.getDocumentElement();
- }
+ }
-
/**
* Decrypt an encrypted element inside a document
* @param documentWithEncryptedElement
@@ -182,7 +293,7 @@
if(encKeyElement == null)
{
//Search the enc data element for enc key
- NodeList nodeList = encDataElement.getElementsByTagNameNS( XMLENC_NS, "EncryptedKey");
+ NodeList nodeList = encDataElement.getElementsByTagNameNS( XMLENC_NS, ENCRYPTED_KEY_LOCALNAME);
if(nodeList == null || nodeList.getLength() == 0)
throw new IllegalStateException("Encrypted Key not found in the enc data");
Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2009-02-26 20:53:23 UTC (rev 350)
+++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2009-02-26 20:53:50 UTC (rev 351)
@@ -25,6 +25,7 @@
import java.io.StringWriter;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
+import java.security.PublicKey;
import java.util.ArrayList;
import java.util.List;
@@ -48,6 +49,8 @@
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
@@ -126,6 +129,57 @@
assertEquals("http://identityurl", assertion.getIssuer().getValue());
}
+
+ public void testArbitraryXML() throws Exception
+ {
+ String myXML = "<somexml><a><b></b></a></somexml>";
+
+ KeyPair kp = this.getKeyPair("RSA");
+ SecretKey sk = this.getSecretKey();
+
+ PublicKey publicKey = kp.getPublic();
+
+ Document doc = DocumentUtil.getDocument(myXML);
+ QName qname = new QName("urn:test", "encryptedA", "someprefix");
+
+ QName elementAQname = new QName("a");
+
+ XMLEncryptionUtil.encryptElement(elementAQname, doc,
+ publicKey, sk, 256, qname, true);
+
+ //Let us verify the document: The original document that has been passed has been updated
+ NodeList nl = doc.getElementsByTagNameNS(XMLEncryptionUtil.XMLENC_NS,
+ XMLEncryptionUtil.ENCRYPTED_KEY_LOCALNAME);
+ assertTrue(nl != null && nl.getLength() == 1);
+
+ Node wrappedNode = doc.getDocumentElement().getFirstChild();
+ assertEquals(wrappedNode.getLocalName(),qname.getLocalPart());
+ assertEquals(wrappedNode.getNamespaceURI(), qname.getNamespaceURI());
+ assertEquals(wrappedNode.getPrefix(), qname.getPrefix());
+ }
+
+ public void testArbitraryXMLWithOuterKeyInfo() throws Exception
+ {
+ String myXML = "<somexml><a><b></b></a></somexml>";
+
+ KeyPair kp = this.getKeyPair("RSA");
+ SecretKey sk = this.getSecretKey();
+
+ PublicKey publicKey = kp.getPublic();
+
+ Document doc = DocumentUtil.getDocument(myXML);
+ QName qname = new QName("urn:test", "encryptedA", "someprefix");
+
+ QName elementAQname = new QName("a");
+
+ XMLEncryptionUtil.encryptElement(elementAQname, doc,
+ publicKey, sk, 256, qname, false);
+
+ //Let us verify the document: The original document that has been passed has been updated
+ NodeList nl = doc.getElementsByTagNameNS(XMLEncryptionUtil.XMLENC_NS,
+ XMLEncryptionUtil.ENCRYPTED_KEY_LOCALNAME);
+ assertTrue(nl != null && nl.getLength() == 1);
+ }
private ResponseType createResponse() throws Exception
{
List<String> roles = new ArrayList<String>();
15 years, 2 months
JBoss Identity SVN: r350 - identity-federation/trunk/parent.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-26 15:53:23 -0500 (Thu, 26 Feb 2009)
New Revision: 350
Modified:
identity-federation/trunk/parent/pom.xml
Log:
JBID-59: apache xml sec 1.4.2
Modified: identity-federation/trunk/parent/pom.xml
===================================================================
--- identity-federation/trunk/parent/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
+++ identity-federation/trunk/parent/pom.xml 2009-02-26 20:53:23 UTC (rev 350)
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache</groupId>
<artifactId>xmlsec</artifactId>
- <version>1.4.1</version>
+ <version>1.4.2</version>
<optional>true</optional>
</dependency>
<dependency>
15 years, 2 months
JBoss Identity SVN: r349 - in idm/trunk: assembly and 6 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-02-26 06:18:43 -0500 (Thu, 26 Feb 2009)
New Revision: 349
Modified:
idm/trunk/assembly/pom.xml
idm/trunk/example/maven2/pom.xml
idm/trunk/idm-api/pom.xml
idm/trunk/idm-common/pom.xml
idm/trunk/idm-spi/pom.xml
idm/trunk/idm/pom.xml
idm/trunk/parent/pom.xml
idm/trunk/pom.xml
Log:
back to snapshot
Modified: idm/trunk/assembly/pom.xml
===================================================================
--- idm/trunk/assembly/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/assembly/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/example/maven2/pom.xml
===================================================================
--- idm/trunk/example/maven2/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/example/maven2/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -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.jboss.identity</groupId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<artifactId>idm-maven2-example</artifactId>
<packaging>jar</packaging>
<name>JBoss Identity IDM Maven2 example project</name>
Modified: idm/trunk/idm/pom.xml
===================================================================
--- idm/trunk/idm/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/idm/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm-api/pom.xml
===================================================================
--- idm/trunk/idm-api/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/idm-api/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm-common/pom.xml
===================================================================
--- idm/trunk/idm-common/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/idm-common/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm-spi/pom.xml
===================================================================
--- idm/trunk/idm-spi/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/idm-spi/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/parent/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>JBoss Identity IDM- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-02-26 11:17:12 UTC (rev 348)
+++ idm/trunk/pom.xml 2009-02-26 11:18:43 UTC (rev 349)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0.Alpha2</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 2 months
JBoss Identity SVN: r348 - idm/tags.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-02-26 06:17:12 -0500 (Thu, 26 Feb 2009)
New Revision: 348
Added:
idm/tags/1.0.0.Alpha2/
Log:
tag 1.0.0.Alpha2
Copied: idm/tags/1.0.0.Alpha2 (from rev 347, idm/trunk)
15 years, 2 months
JBoss Identity SVN: r347 - in idm/trunk: assembly and 10 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: bdaw
Date: 2009-02-26 06:13:14 -0500 (Thu, 26 Feb 2009)
New Revision: 347
Modified:
idm/trunk/assembly/pom.xml
idm/trunk/example/maven2/pom.xml
idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java
idm/trunk/idm-api/pom.xml
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java
idm/trunk/idm-common/pom.xml
idm/trunk/idm-spi/pom.xml
idm/trunk/idm/pom.xml
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java
idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
idm/trunk/parent/pom.xml
idm/trunk/pom.xml
Log:
sync changes for latest snapshot and switch to alpha2
Modified: idm/trunk/assembly/pom.xml
===================================================================
--- idm/trunk/assembly/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/assembly/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/example/maven2/pom.xml
===================================================================
--- idm/trunk/example/maven2/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/example/maven2/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -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.jboss.identity</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<artifactId>idm-maven2-example</artifactId>
<packaging>jar</packaging>
<name>JBoss Identity IDM Maven2 example project</name>
Modified: idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java
===================================================================
--- idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/example/maven2/src/test/java/org/jboss/identity/idm/example/DBTestCase.java 2009-02-26 11:13:14 UTC (rev 347)
@@ -135,6 +135,24 @@
assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture));
+ Identity xUser = identitySession.getPersistenceManager().createIdentity("x");
+ Group someGroup = identitySession.getPersistenceManager().createGroup("someGroup", GROUP);
+
+ identitySession.getRoleManager().createRole(managerRT, xUser, someGroup);
+
+ assertEquals(0, identitySession.getRelationshipManager().findAssociatedGroups(xUser, GROUP).size());
+ assertEquals(1, identitySession.getRoleManager().findGroupsWithRelatedRole(xUser, GROUP, null).size());
+ assertEquals(1, identitySession.getRoleManager().findGroupsWithRelatedRole(xUser, null).size());
+
+ Group otherGroup = identitySession.getPersistenceManager().createGroup("otherGroup", GROUP);
+
+ identitySession.getRelationshipManager().associateIdentities(otherGroup, xUser);
+
+ assertEquals(1, identitySession.getRelationshipManager().findAssociatedGroups(xUser, GROUP).size());
+ assertEquals(1, identitySession.getRoleManager().findGroupsWithRelatedRole(xUser, GROUP, null).size());
+ assertEquals(1, identitySession.getRoleManager().findGroupsWithRelatedRole(xUser, null).size());
+
+
identitySession.getTransaction().commit();
identitySession.close();
Modified: idm/trunk/idm/pom.xml
===================================================================
--- idm/trunk/idm/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java 2009-02-26 11:13:14 UTC (rev 347)
@@ -35,6 +35,8 @@
import org.jboss.identity.idm.exception.IdentityException;
import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType;
import org.jboss.identity.idm.spi.model.IdentityObjectRelationship;
+import org.jboss.identity.idm.spi.model.IdentityObjectType;
+import org.jboss.identity.idm.spi.model.IdentityObject;
import org.jboss.identity.idm.spi.exception.OperationNotSupportedException;
import org.jboss.identity.idm.spi.searchcontrol.IdentityObjectSearchControl;
import org.jboss.identity.idm.impl.NotYetImplementedException;
@@ -45,6 +47,8 @@
import java.util.Collection;
import java.util.Set;
import java.util.HashSet;
+import java.util.List;
+import java.util.LinkedList;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
@@ -286,6 +290,45 @@
}
+ public Collection<Group> findGroupsWithRelatedRole(Identity identity, IdentitySearchControl[] controls) throws IdentityException
+ {
+ List<Group> identities = new LinkedList<Group>();
+
+
+ Collection<IdentityObject> ios = null;
+
+ ios = getRepository().findIdentityObject(getInvocationContext(), createIdentityObject(identity), null, true, convertSearchControls(controls));
+
+ for (IdentityObject io : ios)
+ {
+
+ identities.add(createGroup(io));
+ }
+
+ return identities;
+ }
+
+ public Collection<Group> findGroupsWithRelatedRole(Identity identity, GroupType groupType, IdentitySearchControl[] controls) throws IdentityException
+ {
+ List<Group> identities = new LinkedList<Group>();
+
+ IdentityObjectType iot = getIdentityObjectType(groupType);
+
+ Collection<IdentityObject> ios = null;
+
+ ios = getRepository().findIdentityObject(getInvocationContext(), createIdentityObject(identity), null, true, convertSearchControls(controls));
+
+ for (IdentityObject io : ios)
+ {
+ if (io.getIdentityType().getName().equals(iot.getName()))
+ {
+ identities.add(createGroup(io));
+ }
+ }
+
+ return identities;
+ }
+
public Collection<Role> findRoles(IdentityType identityType, RoleType roleType) throws IdentityException
{
Set<Role> roles = new HashSet<Role>();
Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java
===================================================================
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-26 11:13:14 UTC (rev 347)
@@ -659,7 +659,11 @@
@SuppressWarnings("unchecked")
- public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, IdentityObjectSearchControl[] controls) throws IdentityException
+ public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx,
+ IdentityObject identity,
+ IdentityObjectRelationshipType relationshipType,
+ boolean parent,
+ IdentityObjectSearchControl[] controls) throws IdentityException
{
//TODO:test
@@ -723,9 +727,18 @@
if (parent)
{
- hqlString.append("select ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " +
- "ior.toIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.fromIdentityObject like :identity");
+ if (relationshipType != null)
+ {
+
+ hqlString.append("select ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " +
+ "ior.toIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.fromIdentityObject like :identity");
+ }
+ else
+ {
+ hqlString.append("select ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " +
+ "ior.toIdentityObject.name like :nameFilter and ior.fromIdentityObject like :identity");
+ }
if (orderByName)
{
hqlString.append(" orderBy ior.toIdentityObject.name");
@@ -737,10 +750,17 @@
}
else
{
- hqlString.append("select ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " +
- "ior.fromIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.toIdentityObject like :identity");
+ if (relationshipType != null)
+ {
+ hqlString.append("select ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " +
+ "ior.fromIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.toIdentityObject like :identity");
+ }
+ else
+ {
+ hqlString.append("select ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " +
+ "ior.fromIdentityObject.name like :nameFilter and ior.toIdentityObject like :identity");
+ }
-
if (orderByName)
{
hqlString.append(" orderBy ior.toIdentityObject.name");
@@ -754,9 +774,13 @@
q = getHibernateSession(ctx).createQuery(hqlString.toString())
- .setParameter("relType", relationshipType.getName())
.setParameter("identity",hibernateObject);
+ if (relationshipType != null)
+ {
+ q.setParameter("relType", relationshipType.getName());
+ }
+
if (nameFilterSearchControl != null)
{
q.setParameter("nameFilter", nameFilterSearchControl.getFilter().replaceAll("\\*", "%"));
Modified: idm/trunk/idm-api/pom.xml
===================================================================
--- idm/trunk/idm-api/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm-api/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-02-26 11:13:14 UTC (rev 347)
@@ -168,10 +168,6 @@
/**
* Find all groups that given identity is associated with.
- * If the paginatedSearch or orderedSearch operations
- * are not supported, dedicated parameters will
- * take no effect
- *
* @param identity child identity
* @param groupType can be null
* @return
Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java
===================================================================
--- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-02-26 11:13:14 UTC (rev 347)
@@ -176,6 +176,30 @@
IdentitySearchControl[] controls) throws IdentityException;
/**
+ * Find all Groups with which Identity has a Role association
+ *
+ * @param identity
+ * @param controls
+ * @return
+ * @throws IdentityException
+ */
+ Collection<Group> findGroupsWithRelatedRole(Identity identity,
+ IdentitySearchControl[] controls) throws IdentityException;
+
+
+ /**
+ * Find all Groups with which Identity has a Role association
+ *
+ * @param identity
+ * @param controls
+ * @return
+ * @throws IdentityException
+ */
+ Collection<Group> findGroupsWithRelatedRole(Identity identity,
+ GroupType groupType,
+ IdentitySearchControl[] controls) throws IdentityException;
+
+ /**
* Find Role objects with a given RoleType associated with a given IdentityType
* @param identityType
* @param roleType
Modified: idm/trunk/idm-common/pom.xml
===================================================================
--- idm/trunk/idm-common/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm-common/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/idm-spi/pom.xml
===================================================================
--- idm/trunk/idm-spi/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/idm-spi/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/parent/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -8,7 +8,7 @@
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<name>JBoss Identity IDM- Parent</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-02-23 20:47:59 UTC (rev 346)
+++ idm/trunk/pom.xml 2009-02-26 11:13:14 UTC (rev 347)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 2 months
JBoss Identity SVN: r346 - in platform-build/trunk: identity-platform-tomcat and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-02-23 15:47:59 -0500 (Mon, 23 Feb 2009)
New Revision: 346
Modified:
platform-build/trunk/identity-platform-jbas/bin.xml
platform-build/trunk/identity-platform-tomcat/bin.xml
Log:
add jbossxacml
Modified: platform-build/trunk/identity-platform-jbas/bin.xml
===================================================================
--- platform-build/trunk/identity-platform-jbas/bin.xml 2009-02-23 18:58:27 UTC (rev 345)
+++ platform-build/trunk/identity-platform-jbas/bin.xml 2009-02-23 20:47:59 UTC (rev 346)
@@ -9,6 +9,7 @@
<include>org.jboss.identity:jboss-identity-bindings</include>
<include>org.jboss.identity:jboss-identity-bindings-jboss</include>
<include>org.jboss.identity:jboss-identity-fed</include>
+ <include>org.jboss.security:jbossxacml</include>
</includes>
</dependencySet>
</dependencySets>
Modified: platform-build/trunk/identity-platform-tomcat/bin.xml
===================================================================
--- platform-build/trunk/identity-platform-tomcat/bin.xml 2009-02-23 18:58:27 UTC (rev 345)
+++ platform-build/trunk/identity-platform-tomcat/bin.xml 2009-02-23 20:47:59 UTC (rev 346)
@@ -8,6 +8,7 @@
<includes>
<include>org.jboss.identity:jboss-identity-bindings</include>
<include>org.jboss.identity:jboss-identity-fed</include>
+ <include>org.jboss.security:jbossxacml</include>
</includes>
</dependencySet>
</dependencySets>
15 years, 2 months