JBoss Identity SVN: r526 - in idm/trunk: parent and 1 other directory.
by jboss-identity-commits@lists.jboss.org
Author: bdaw
Date: 2009-05-25 03:30:40 -0400 (Mon, 25 May 2009)
New Revision: 526
Modified:
idm/trunk/parent/pom.xml
idm/trunk/pom.xml
Log:
put distro profile in main pom
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-05-25 07:13:54 UTC (rev 525)
+++ idm/trunk/parent/pom.xml 2009-05-25 07:30:40 UTC (rev 526)
@@ -80,49 +80,8 @@
<!-- Profiles -->
<profiles>
+
<profile>
- <id>distro</id>
- <modules>
- <module>../distro</module>
- <module>../assembly</module>
- </modules>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>provided-jdbc-driver</id>
<dependencies>
<dependency>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-05-25 07:13:54 UTC (rev 525)
+++ idm/trunk/pom.xml 2009-05-25 07:30:40 UTC (rev 526)
@@ -30,7 +30,63 @@
<!--<module>example/auth</module>-->
</modules>
+ <profiles>
+ <profile>
+ <id>distro</id>
+ <modules>
+ <module>parent</module>
+ <module>idm-common</module>
+ <module>idm-spi</module>
+ <module>idm-api</module>
+ <module>idm-core</module>
+ <module>idm-hibernate</module>
+ <module>idm-ldap</module>
+ <module>idm-cache</module>
+ <module>idm-auth</module>
+ <module>idm-testsuite</module>
+ <module>integration</module>
+ <module>distro</module>
+ <module>assembly</module>
+ </modules>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
15 years, 7 months
JBoss Identity SVN: r525 - in idm/trunk: integration/jboss5/src/main/resources and 1 other directory.
by jboss-identity-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-25 03:13:54 -0400 (Mon, 25 May 2009)
New Revision: 525
Modified:
idm/trunk/distro/pom.xml
idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
Log:
* Update.
Modified: idm/trunk/distro/pom.xml
===================================================================
--- idm/trunk/distro/pom.xml 2009-05-25 06:38:46 UTC (rev 524)
+++ idm/trunk/distro/pom.xml 2009-05-25 07:13:54 UTC (rev 525)
@@ -8,7 +8,7 @@
<name>JBoss Identity IDM Distro </name>
<parent>
- <groupId>org.jboss.identity</groupId>
+ <groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
Modified: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
===================================================================
--- idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-25 06:38:46 UTC (rev 524)
+++ idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-25 07:13:54 UTC (rev 525)
@@ -101,6 +101,10 @@
<relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
<identity-object-type-ref>GROUP</identity-object-type-ref>
</relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>unit</identity-object-type-ref>
+ </relationship>
</relationships>
<credentials/>
<attributes/>
15 years, 7 months
JBoss Identity SVN: r524 - in idm/tags/1.0.0.Alpha6: distro and 1 other directories.
by jboss-identity-commits@lists.jboss.org
Author: bdaw
Date: 2009-05-25 02:38:46 -0400 (Mon, 25 May 2009)
New Revision: 524
Modified:
idm/tags/1.0.0.Alpha6/distro/pom.xml
idm/tags/1.0.0.Alpha6/parent/pom.xml
idm/tags/1.0.0.Alpha6/pom.xml
Log:
plug distro to the build
Modified: idm/tags/1.0.0.Alpha6/distro/pom.xml
===================================================================
--- idm/tags/1.0.0.Alpha6/distro/pom.xml 2009-05-25 06:10:06 UTC (rev 523)
+++ idm/tags/1.0.0.Alpha6/distro/pom.xml 2009-05-25 06:38:46 UTC (rev 524)
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>idm-distro</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<packaging>jar</packaging>
<name>JBoss Identity IDM Distro </name>
<parent>
- <groupId>org.jboss.identity</groupId>
+ <groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
<version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
Modified: idm/tags/1.0.0.Alpha6/parent/pom.xml
===================================================================
--- idm/tags/1.0.0.Alpha6/parent/pom.xml 2009-05-25 06:10:06 UTC (rev 523)
+++ idm/tags/1.0.0.Alpha6/parent/pom.xml 2009-05-25 06:38:46 UTC (rev 524)
@@ -81,48 +81,6 @@
<profiles>
<profile>
- <id>distro</id>
- <modules>
- <module>../distro</module>
- <module>../assembly</module>
- </modules>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>provided-jdbc-driver</id>
<dependencies>
<dependency>
Modified: idm/tags/1.0.0.Alpha6/pom.xml
===================================================================
--- idm/tags/1.0.0.Alpha6/pom.xml 2009-05-25 06:10:06 UTC (rev 523)
+++ idm/tags/1.0.0.Alpha6/pom.xml 2009-05-25 06:38:46 UTC (rev 524)
@@ -30,7 +30,63 @@
<!--<module>example/auth</module>-->
</modules>
+ <profiles>
+ <profile>
+ <id>distro</id>
+ <modules>
+ <module>parent</module>
+ <module>idm-common</module>
+ <module>idm-spi</module>
+ <module>idm-api</module>
+ <module>idm-core</module>
+ <module>idm-hibernate</module>
+ <module>idm-ldap</module>
+ <module>idm-cache</module>
+ <module>idm-auth</module>
+ <module>idm-testsuite</module>
+ <module>integration</module>
+ <module>distro</module>
+ <module>assembly</module>
+ </modules>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
15 years, 7 months
JBoss Identity SVN: r523 - in idm/trunk: parent and 1 other directory.
by jboss-identity-commits@lists.jboss.org
Author: bdaw
Date: 2009-05-25 02:10:06 -0400 (Mon, 25 May 2009)
New Revision: 523
Modified:
idm/trunk/parent/pom.xml
idm/trunk/pom.xml
Log:
put back jboss parent
Modified: idm/trunk/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
+++ idm/trunk/parent/pom.xml 2009-05-25 06:10:06 UTC (rev 523)
@@ -1,4 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
Modified: idm/trunk/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
+++ idm/trunk/pom.xml 2009-05-25 06:10:06 UTC (rev 523)
@@ -26,8 +26,8 @@
<module>idm-auth</module>
<module>idm-testsuite</module>
<module>integration</module>
- <module>example/simple</module>
- <module>example/auth</module>
+ <!--<module>example/simple</module>-->
+ <!--<module>example/auth</module>-->
</modules>
15 years, 7 months
JBoss Identity SVN: r522 - in idm/tags: 1.0.0.Alpha6 and 17 other directories.
by jboss-identity-commits@lists.jboss.org
Author: bdaw
Date: 2009-05-25 01:58:45 -0400 (Mon, 25 May 2009)
New Revision: 522
Added:
idm/tags/1.0.0.Alpha6/
Modified:
idm/tags/1.0.0.Alpha6/assembly/pom.xml
idm/tags/1.0.0.Alpha6/distro/pom.xml
idm/tags/1.0.0.Alpha6/example/auth/pom.xml
idm/tags/1.0.0.Alpha6/example/simple/pom.xml
idm/tags/1.0.0.Alpha6/idm-api/pom.xml
idm/tags/1.0.0.Alpha6/idm-auth/pom.xml
idm/tags/1.0.0.Alpha6/idm-cache/pom.xml
idm/tags/1.0.0.Alpha6/idm-common/pom.xml
idm/tags/1.0.0.Alpha6/idm-core/pom.xml
idm/tags/1.0.0.Alpha6/idm-hibernate/pom.xml
idm/tags/1.0.0.Alpha6/idm-ldap/pom.xml
idm/tags/1.0.0.Alpha6/idm-spi/pom.xml
idm/tags/1.0.0.Alpha6/idm-testsuite/pom.xml
idm/tags/1.0.0.Alpha6/integration/deployer/pom.xml
idm/tags/1.0.0.Alpha6/integration/jboss5/pom.xml
idm/tags/1.0.0.Alpha6/integration/pom.xml
idm/tags/1.0.0.Alpha6/parent/pom.xml
idm/tags/1.0.0.Alpha6/pom.xml
Log:
tag 1.0.0.Alpha6
Copied: idm/tags/1.0.0.Alpha6 (from rev 521, idm/trunk)
Modified: idm/tags/1.0.0.Alpha6/assembly/pom.xml
===================================================================
--- idm/trunk/assembly/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/assembly/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>idm-assembly</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<packaging>jar</packaging>
<name>JBoss Identity IDM Assembly </name>
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/tags/1.0.0.Alpha6/distro/pom.xml
===================================================================
--- idm/trunk/distro/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/distro/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.identity</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
Modified: idm/tags/1.0.0.Alpha6/example/auth/pom.xml
===================================================================
--- idm/trunk/example/auth/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/example/auth/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -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.idm.example</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<artifactId>example-auth</artifactId>
<packaging>jar</packaging>
<name>Example - JEE authentication</name>
Modified: idm/tags/1.0.0.Alpha6/example/simple/pom.xml
===================================================================
--- idm/trunk/example/simple/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/example/simple/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -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.idm.example</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<artifactId>example-simple</artifactId>
<packaging>jar</packaging>
<name>Example - Simple JBoss Identity IDM Maven2 project</name>
Modified: idm/tags/1.0.0.Alpha6/idm-api/pom.xml
===================================================================
--- idm/trunk/idm-api/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-api/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-auth/pom.xml
===================================================================
--- idm/trunk/idm-auth/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-auth/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-cache/pom.xml
===================================================================
--- idm/trunk/idm-cache/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-cache/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-common/pom.xml
===================================================================
--- idm/trunk/idm-common/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-common/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-core/pom.xml
===================================================================
--- idm/trunk/idm-core/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-core/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-hibernate/pom.xml
===================================================================
--- idm/trunk/idm-hibernate/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-hibernate/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-ldap/pom.xml
===================================================================
--- idm/trunk/idm-ldap/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-ldap/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-spi/pom.xml
===================================================================
--- idm/trunk/idm-spi/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-spi/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/idm-testsuite/pom.xml
===================================================================
--- idm/trunk/idm-testsuite/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/idm-testsuite/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: idm/tags/1.0.0.Alpha6/integration/deployer/pom.xml
===================================================================
--- idm/trunk/integration/deployer/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/integration/deployer/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -8,12 +8,12 @@
<groupId>org.jboss.identity.idm.integration</groupId>
<artifactId>idm-jboss5-deployer</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
</parent>
<properties>
Modified: idm/tags/1.0.0.Alpha6/integration/jboss5/pom.xml
===================================================================
--- idm/trunk/integration/jboss5/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/integration/jboss5/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -8,12 +8,12 @@
<groupId>org.jboss.identity.idm.integration</groupId>
<artifactId>idm-jboss5</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
</parent>
<properties>
Modified: idm/tags/1.0.0.Alpha6/integration/pom.xml
===================================================================
--- idm/trunk/integration/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/integration/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: idm/tags/1.0.0.Alpha6/parent/pom.xml
===================================================================
--- idm/trunk/parent/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/parent/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -1,9 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</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/tags/1.0.0.Alpha6/pom.xml
===================================================================
--- idm/trunk/pom.xml 2009-05-24 18:44:55 UTC (rev 521)
+++ idm/tags/1.0.0.Alpha6/pom.xml 2009-05-25 05:58:45 UTC (rev 522)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.identity.idm</groupId>
<artifactId>idm-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha6</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -26,8 +26,8 @@
<module>idm-auth</module>
<module>idm-testsuite</module>
<module>integration</module>
- <module>example/simple</module>
- <module>example/auth</module>
+ <!--<module>example/simple</module>-->
+ <!--<module>example/auth</module>-->
</modules>
15 years, 7 months
JBoss Identity SVN: r521 - idm/trunk/integration/jboss5/src/main/resources.
by jboss-identity-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-24 14:44:55 -0400 (Sun, 24 May 2009)
New Revision: 521
Modified:
idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
Log:
* update the identity-object-type name.
Modified: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
===================================================================
--- idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-24 18:36:19 UTC (rev 520)
+++ idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-24 18:44:55 UTC (rev 521)
@@ -87,7 +87,7 @@
<options/>
</identity-object-type>
<identity-object-type>
- <name>UNIT</name>
+ <name>unit</name>
<relationships>
<relationship>
<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
15 years, 7 months
JBoss Identity SVN: r520 - idm/trunk/integration/jboss5/src/main/resources.
by jboss-identity-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-05-24 14:36:19 -0400 (Sun, 24 May 2009)
New Revision: 520
Modified:
idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
Log:
* Add unit object-type for jbpm.
Modified: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml
===================================================================
--- idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-23 05:41:31 UTC (rev 519)
+++ idm/trunk/integration/jboss5/src/main/resources/jboss.idm.cfg.xml 2009-05-24 18:36:19 UTC (rev 520)
@@ -86,6 +86,26 @@
<attributes/>
<options/>
</identity-object-type>
+ <identity-object-type>
+ <name>UNIT</name>
+ <relationships>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>USER</identity-object-type-ref>
+ </relationship>
+ <relationship>
+ <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
+ <identity-object-type-ref>GROUP</identity-object-type-ref>
+ </relationship>
+ </relationships>
+ <credentials/>
+ <attributes/>
+ <options/>
+ </identity-object-type>
</supported-identity-object-types>
<options>
<option>
15 years, 7 months
JBoss Identity SVN: r519 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp and 2 other directories.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-05-23 01:41:31 -0400 (Sat, 23 May 2009)
New Revision: 519
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
Log:
JBID-117: generic exception catch clean
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -169,10 +169,11 @@
try
{
trustedProviders = configProvider.loadTrustedProviders(spName);
- }
- catch(Exception e)
+ }
+ catch (ClassNotFoundException e)
{
log("Error obtaining the trusted providers for "+spName);
+ throw new RuntimeException(e);
}
finally
{
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -112,7 +112,18 @@
if(response.getStatus() == HttpServletResponse.SC_FORBIDDEN)
{
ResponseType errorResponseType = this.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get());
- send(errorResponseType, request.getParameter("RelayState"), response);
+ try
+ {
+ send(errorResponseType, request.getParameter("RelayState"), response);
+ }
+ catch (ParsingException e)
+ {
+ log.error(e);
+ }
+ catch (ProcessingException e)
+ {
+ log.error(e);
+ }
return;
}
@@ -140,7 +151,18 @@
if(requestAbstractType != null)
referer = requestAbstractType.getIssuer().getValue();
ResponseType errorResponseType = this.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_RESPONDER.get());
- send(errorResponseType, request.getParameter("RelayState"), response);
+ try
+ {
+ send(errorResponseType, request.getParameter("RelayState"), response);
+ }
+ catch (ParsingException e1)
+ {
+ log.error(e1);
+ }
+ catch (ProcessingException e1)
+ {
+ log.error(e1);
+ }
}
}
else
@@ -178,30 +200,38 @@
}
}
- protected void send(ResponseType responseType, String relayState, Response response) throws ServletException
+ protected void send(ResponseType responseType, String relayState, Response response)
+ throws ParsingException, ProcessingException
{
try
{
SAML2Response saml2Response = new SAML2Response();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- saml2Response.marshall(responseType, baos);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ saml2Response.marshall(responseType, baos);
- String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray());
+ String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray());
- String destination = responseType.getDestination();
- log.trace("IDP:Destination=" + destination);
-
- if(relayState != null && relayState.length() > 0)
- relayState = RedirectBindingUtil.urlEncode(relayState);
-
- String finalDest = destination + this.getDestination(urlEncodedResponse, relayState);
- HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
- }
- catch(Exception e)
+ String destination = responseType.getDestination();
+ log.trace("IDP:Destination=" + destination);
+
+ if(relayState != null && relayState.length() > 0)
+ relayState = RedirectBindingUtil.urlEncode(relayState);
+
+ String finalDest = destination + this.getDestination(urlEncodedResponse, relayState);
+ HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
+ }
+ catch (JAXBException e)
{
- log.error("Exception in send::",e);
- throw new ServletException(e.getLocalizedMessage());
+ throw new ParsingException(e);
}
+ catch (SAXException e)
+ {
+ throw new ParsingException(e);
+ }
+ catch (IOException e)
+ {
+ throw new ProcessingException(e);
+ }
}
/**
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -43,8 +43,10 @@
import org.jboss.identity.federation.bindings.interfaces.RoleGenerator;
import org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator;
import org.jboss.identity.federation.bindings.util.ValveUtil;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.exceptions.ParsingException;
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
+import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
@@ -106,14 +108,15 @@
//Look for unauthorized status
if(response.getStatus() == HttpServletResponse.SC_FORBIDDEN)
{
- ResponseType errorResponseType =
- webRequestUtil.getErrorResponse(referer,
+ try
+ {
+ ResponseType errorResponseType =
+ webRequestUtil.getErrorResponse(referer,
JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
this.identityURL);
- try
- {
+
webRequestUtil.send(errorResponseType, relayState, response);
- }
+ }
catch (ParsingException e)
{
throw new ServletException(e);
@@ -138,29 +141,54 @@
{
//Get the SAML Request Message
RequestAbstractType requestAbstractType = null;
- try
- {
- requestAbstractType = webRequestUtil.getSAMLRequest(samlMessage);
- this.validate(request);
- webRequestUtil.isTrusted(requestAbstractType.getIssuer().getValue());
+ ResponseType responseType = null;
+
+ try
+ {
+ requestAbstractType = webRequestUtil.getSAMLRequest(samlMessage);
+ this.validate(request);
+ webRequestUtil.isTrusted(requestAbstractType.getIssuer().getValue());
- List<String> roles = rg.generateRoles(userPrincipal);
+ List<String> roles = rg.generateRoles(userPrincipal);
- AuthnRequestType art = (AuthnRequestType) requestAbstractType;
- ResponseType responseType =
- webRequestUtil.getResponse(art.getAssertionConsumerServiceURL(),
- userPrincipal, roles,
- this.identityURL, this.assertionValidity);
- webRequestUtil.send(responseType, relayState, response);
-
- }
- catch (Exception e)
- {
- log.error("Exception:" ,e);
- if(requestAbstractType != null)
- referer = requestAbstractType.getIssuer().getValue();
- sendErrorResponseToSP(referer, response, relayState, webRequestUtil);
- }
+ AuthnRequestType art = (AuthnRequestType) requestAbstractType;
+ responseType =
+ webRequestUtil.getResponse(art.getAssertionConsumerServiceURL(),
+ userPrincipal, roles,
+ this.identityURL, this.assertionValidity);
+ }
+ catch (IssuerNotTrustedException e)
+ {
+ responseType =
+ webRequestUtil.getErrorResponse(referer,
+ JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get(),
+ this.identityURL);
+ }
+ catch (ParsingException e)
+ {
+ responseType =
+ webRequestUtil.getErrorResponse(referer,
+ JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
+ this.identityURL);
+ }
+ catch (ConfigurationException e)
+ {
+ responseType =
+ webRequestUtil.getErrorResponse(referer,
+ JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
+ this.identityURL);
+ }
+ finally
+ {
+ try
+ {
+ webRequestUtil.send(responseType, relayState, response);
+ }
+ catch (ParsingException e)
+ {
+ log.trace(e);
+ }
+ }
return;
}
else
@@ -168,13 +196,20 @@
log.error("No SAML Request Message");
log.trace("Referer="+referer);
- sendErrorResponseToSP(referer, response, relayState, webRequestUtil);
+ try
+ {
+ sendErrorResponseToSP(referer, response, relayState, webRequestUtil);
+ }
+ catch (ConfigurationException e)
+ {
+ log.trace(e);
+ }
}
}
}
protected void sendErrorResponseToSP(String referrer, Response response, String relayState,
- IDPWebRequestUtil webRequestUtil) throws ServletException, IOException
+ IDPWebRequestUtil webRequestUtil) throws ServletException, IOException, ConfigurationException
{
ResponseType errorResponseType =
webRequestUtil.getErrorResponse(referrer, JBossSAMLURIConstants.STATUS_RESPONDER.get(),
@@ -190,6 +225,7 @@
}
+
//***************Lifecycle
/**
* The lifecycle event support for this component.
@@ -287,7 +323,7 @@
started = false;
}
- protected boolean validate(Request request) throws Exception
+ protected boolean validate(Request request)
{
return request.getParameter("SAMLRequest") != null;
}
Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -29,7 +29,6 @@
import java.security.Principal;
import java.util.List;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.JAXBException;
import javax.xml.datatype.DatatypeConfigurationException;
@@ -40,7 +39,7 @@
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
import org.jboss.identity.federation.bindings.config.IDPType;
-import org.jboss.identity.federation.bindings.config.TrustType;
+import org.jboss.identity.federation.bindings.config.TrustType;
import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil;
import org.jboss.identity.federation.bindings.util.PostBindingUtil;
import org.jboss.identity.federation.bindings.util.RedirectBindingUtil;
@@ -101,7 +100,8 @@
return postProfile;
}
- public RequestAbstractType getSAMLRequest(String samlMessage) throws JAXBException, SAXException
+ public RequestAbstractType getSAMLRequest(String samlMessage)
+ throws ParsingException
{
InputStream is = null;
SAML2Request saml2Request = new SAML2Request();
@@ -116,7 +116,18 @@
is = new ByteArrayInputStream(samlBytes);
}
- return saml2Request.getRequestType(is);
+ try
+ {
+ return saml2Request.getRequestType(is);
+ }
+ catch (JAXBException e)
+ {
+ throw new ParsingException(e);
+ }
+ catch (SAXException e)
+ {
+ throw new ParsingException(e);
+ }
}
@@ -124,7 +135,8 @@
Principal userPrincipal,
List<String> roles,
String identityURL,
- long assertionValidity) throws ConfigurationException, DatatypeConfigurationException, JAXBException, SAXException
+ long assertionValidity)
+ throws ConfigurationException
{
ResponseType responseType = null;
@@ -152,13 +164,31 @@
assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
//Add timed conditions
- saml2Response.createTimedConditions(assertion, assertionValidity);
+ try
+ {
+ saml2Response.createTimedConditions(assertion, assertionValidity);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ throw new ConfigurationException(e);
+ }
//Lets see how the response looks like
if(log.isTraceEnabled())
{
StringWriter sw = new StringWriter();
- saml2Response.marshall(responseType, sw);
+ try
+ {
+ saml2Response.marshall(responseType, sw);
+ }
+ catch (JAXBException e)
+ {
+ log.trace(e);
+ }
+ catch (SAXException e)
+ {
+ log.trace(e);
+ }
log.trace("Response="+sw.toString());
}
@@ -273,15 +303,13 @@
* @param status
* @param identityURL
* @return
- * @throws ServletException
+ * @throws ConfigurationException
*/
public ResponseType getErrorResponse(String responseURL, String status,
- String identityURL) throws ServletException
+ String identityURL)
{
if(redirectProfile)
{
- try
- {
ResponseType responseType = null;
SAML2Response saml2Response = new SAML2Response();
@@ -298,24 +326,37 @@
SPInfoHolder sp = new SPInfoHolder();
sp.setResponseDestinationURI(responseURL);
- responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
+ try
+ {
+ responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
+ }
+ catch (ConfigurationException e1)
+ {
+ log.trace(e1);
+ responseType = saml2Response.createResponseType();
+ }
log.debug("ResponseType = ");
//Lets see how the response looks like
if(log.isTraceEnabled())
{
StringWriter sw = new StringWriter();
- saml2Response.marshall(responseType, sw);
+ try
+ {
+ saml2Response.marshall(responseType, sw);
+ }
+ catch (JAXBException e)
+ {
+ log.trace(e);
+ }
+ catch (SAXException e)
+ {
+ log.trace(e);
+ }
log.trace("Response="+sw.toString());
}
- return responseType;
- }
- catch(Exception e)
- {
- log.error("Exception in getErrorResponse::",e);
- throw new ServletException(e.getLocalizedMessage());
- }
+ return responseType;
}
return null;
Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -102,6 +102,15 @@
}
/**
+ * Create an empty response type
+ * @return
+ */
+ public ResponseType createResponseType()
+ {
+ return JBossSAMLAuthnResponseFactory.createResponseType();
+ }
+
+ /**
* Create a ResponseType
* @param ID
* @param issuerInfo
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-05-23 05:40:53 UTC (rev 518)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-05-23 05:41:31 UTC (rev 519)
@@ -68,6 +68,15 @@
}
/**
+ * Create an empty response type
+ * @return
+ */
+ public static ResponseType createResponseType()
+ {
+ return SAMLProtocolFactory.getObjectFactory().createResponseType();
+ }
+
+ /**
* Create a ResponseType
* @param ID id of the response
* @param sp holder with the information about the Service Provider
15 years, 8 months
JBoss Identity SVN: r518 - identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-05-23 01:40:53 -0400 (Sat, 23 May 2009)
New Revision: 518
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java
Log:
more constants
Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2009-05-23 04:50:19 UTC (rev 517)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2009-05-23 05:40:53 UTC (rev 518)
@@ -30,6 +30,14 @@
public enum JBossSAMLURIConstants
{
AC_PASSWORD_PROTECTED_TRANSPORT("urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"),
+ AC_PASSWORD("urn:oasis:names:tc:SAML:2.0:ac:classes:Password"),
+ AC_TLS_CLIENT("urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient"),
+ AC_PREVIOUS_SESSION("urn:oasis:names:tc:SAML:2.0:ac:classes:PreviousSession"),
+ AC_UNSPECIFIED("urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified"),
+ AC_IP("urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol"),
+
+
+
ASSERTION_NSURI("urn:oasis:names:tc:SAML:2.0:assertion"),
ATTRIBUTE_FORMAT_BASIC("urn:oasis:names:tc:SAML:2.0:attrname-format:basic"),
@@ -37,6 +45,14 @@
NAMEID_FORMAT_TRANSIENT("urn:oasis:names:tc:SAML:2.0:nameid-format:transient"),
NAMEID_FORMAT_PERSISTENT("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"),
+ NAMEID_FORMAT_UNSPECIFIED("urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"),
+ NAMEID_FORMAT_EMAIL("urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"),
+ NAMEID_FORMAT_X509SUBJECTNAME("urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName"),
+ NAMEID_FORMAT_WINDOWS_DOMAIN_NAME("urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName"),
+ NAMEID_FORMAT_KERBEROS("urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos"),
+ NAMEID_FORMAT_ENTITY("urn:oasis:names:tc:SAML:2.0:nameid-format:entity"),
+
+
PROTOCOL_NSURI("urn:oasis:names:tc:SAML:2.0:protocol"),
@@ -46,13 +62,37 @@
SUBJECT_CONFIRMATION_BEARER("urn:oasis:names:tc:SAML:2.0:cm:bearer"),
- STATUS_AUTHNFAILED("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"),
+ STATUS_AUTHNFAILED("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"),
+ STATUS_INVALID_ATTRNAMEVAL("urn:oasis:names:tc:SAML:2.0:status:InvalidAttrnameOrValue"),
+ STATUS_INVALID_NAMEIDPOLICY("urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"),
+ STATUS_NOAUTHN_CTX("urn:oasis:names:tc:SAML:2.0:status:NoAuthnContext"),
+ STATUS_NO_AVAILABLE_IDP("urn:oasis:names:tc:SAML:2.0:status:NoAvailableIDP"),
+ STATUS_NO_PASSIVE("urn:oasis:names:tc:SAML:2.0:status:NoPassive"),
+ STATUS_NO_SUPPORTED_IDP("urn:oasis:names:tc:SAML:2.0:status:NoSupportedIDP"),
+ STATUS_PARTIAL_LOGOUT("urn:oasis:names:tc:SAML:2.0:status:PartialLogout"),
+ STATUS_PROXYCOUNT_EXCEEDED("urn:oasis:names:tc:SAML:2.0:status:ProxyCountExceeded"),
+ STATUS_REQUEST_DENIED("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"),
+ STATUS_REQUEST_UNSUPPORTED("urn:oasis:names:tc:SAML:2.0:status:RequestUnsupported"),
+ STATUS_REQUEST_VERSION_DEPRECATED("urn:oasis:names:tc:SAML:2.0:status:RequestVersionDeprecated"),
+ STATUS_REQUEST_VERSION_2HIGH("urn:oasis:names:tc:SAML:2.0:status:RequestVersionTooHigh"),
+ STATUS_REQUEST_VERSION_2LOW("urn:oasis:names:tc:SAML:2.0:status:RequestVersionTooLow"),
+ STATUS_RESOURCE_NOT_RECOGNIZED("urn:oasis:names:tc:SAML:2.0:status:ResourceNotRecognized"),
+ STATUS_2MANY_RESPONSES("urn:oasis:names:tc:SAML:2.0:status:TooManyResponses"),
+ STATUS_UNKNOWN_ATTR_PROFILE("urn:oasis:names:tc:SAML:2.0:status:UnknownAttributeProfile"),
+ STATUS_UNKNOWN_PRINCIPAL("urn:oasis:names:tc:SAML:2.0:status:UnknownPrincipal"),
+ STATUS_UNSUPPORTED_BINDING("urn:oasis:names:tc:SAML:2.0:status:UnsupportedBinding"),
+
+
+
+
+
STATUS_REQUESTOR("urn:oasis:names:tc:SAML:2.0:status:Requestor"),
STATUS_RESPONDER("urn:oasis:names:tc:SAML:2.0:status:Responder"),
STATUS_SUCCESS("urn:oasis:names:tc:SAML:2.0:status:Success"),
STATUS_VERSION_MISMATCH("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"),
+
TRANSFORM_ENVELOPED_SIGNATURE("http://www.w3.org/2000/09/xmldsig#enveloped-signature"),
TRANSFORM_C14N_EXCL_OMIT_COMMENTS("http://www.w3.org/2001/10/xml-exc-c14n#WithComments"),
15 years, 8 months
JBoss Identity SVN: r517 - in identity-federation/trunk: jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util and 1 other directories.
by jboss-identity-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-05-23 00:50:19 -0400 (Sat, 23 May 2009)
New Revision: 517
Added:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyConfigurationException.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyProcessingException.java
identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/JNDIUtilUnitTestCase.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/exceptions/ProcessingException.java
Log:
JBID-111: generic exception throwing cleaned up
Added: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyConfigurationException.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyConfigurationException.java (rev 0)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyConfigurationException.java 2009-05-23 04:50:19 UTC (rev 517)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.interfaces;
+
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
+
+/**
+ * ConfigurationException in the TrustKeyManager
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 22, 2009
+ */
+public class TrustKeyConfigurationException extends ConfigurationException
+{
+ private static final long serialVersionUID = 1L;
+
+ public TrustKeyConfigurationException()
+ {
+ super();
+ }
+
+ public TrustKeyConfigurationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public TrustKeyConfigurationException(String message)
+ {
+ super(message);
+ }
+
+ public TrustKeyConfigurationException(Throwable cause)
+ {
+ super(cause);
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyProcessingException.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyProcessingException.java (rev 0)
+++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyProcessingException.java 2009-05-23 04:50:19 UTC (rev 517)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.interfaces;
+
+import org.jboss.identity.federation.core.exceptions.ProcessingException;
+
+/**
+ * Processing Exception in the trust key manager
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 22, 2009
+ */
+public class TrustKeyProcessingException extends ProcessingException
+{
+ private static final long serialVersionUID = 1L;
+
+ public TrustKeyProcessingException()
+ {
+ super();
+ }
+
+ public TrustKeyProcessingException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public TrustKeyProcessingException(String message)
+ {
+ super(message);
+ }
+
+ public TrustKeyProcessingException(Throwable cause)
+ {
+ super(cause);
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/JNDIUtilUnitTestCase.java
===================================================================
--- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/JNDIUtilUnitTestCase.java (rev 0)
+++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/JNDIUtilUnitTestCase.java 2009-05-23 04:50:19 UTC (rev 517)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.identity.federation.bindings.util;
+
+import junit.framework.TestCase;
+
+
+/**
+ * JNDI Util test case
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 27, 2009
+ */
+public class JNDIUtilUnitTestCase extends TestCase
+{
+ @SuppressWarnings("unchecked")
+ public void testJNDIConnection() throws Exception
+ {
+ /*Hashtable env = new Hashtable();
+ env.put(Context.INITIAL_CONTEXT_FACTORY,"com.sun.jndi.ldap.LdapCtxFactory");
+ env.put(Context.PROVIDER_URL, "ldap://localhost:389");
+ env.put(Context.SECURITY_AUTHENTICATION,"simple");
+ env.put(Context.SECURITY_PRINCIPAL,"cn=Manager,dc=jboss,dc=org");
+ env.put(Context.SECURITY_CREDENTIALS,"test");
+ DirContext ctx = new InitialDirContext(env);
+
+ //Read stuff
+ Object obj = ctx.lookup("ou=identity,dc=jboss,dc=org");
+ assertNotNull("Obj is not null", obj);
+ assertTrue(obj instanceof LdapContext);
+
+ obj = ctx.lookup("ou=idp,ou=identity,dc=jboss,dc=org");
+ assertNotNull("Obj is not null", obj);
+ assertTrue(obj instanceof LdapContext);
+
+ SearchControls sc = new SearchControls();
+ sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ NamingEnumeration<SearchResult> ne = ctx.search("ou=idp,ou=identity,dc=jboss,dc=org",
+ "(ou=providers)", sc);
+
+ while(ne.hasMore())
+ {
+ SearchResult sr = ne.next();
+ System.out.println(sr.toString());
+ }*/
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/exceptions/ProcessingException.java
===================================================================
--- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/exceptions/ProcessingException.java (rev 0)
+++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/exceptions/ProcessingException.java 2009-05-23 04:50:19 UTC (rev 517)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.core.exceptions;
+
+/**
+ * Exception to indicate a server processing error
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 22, 2009
+ */
+public class ProcessingException extends Exception
+{
+ private static final long serialVersionUID = 1L;
+
+ public ProcessingException()
+ {
+ super();
+ }
+
+ public ProcessingException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public ProcessingException(String message)
+ {
+ super(message);
+ }
+
+ public ProcessingException(Throwable cause)
+ {
+ super(cause);
+ }
+}
\ No newline at end of file
15 years, 8 months