Author: dimuthul
Date: Sun Mar 30 23:56:06 2008
New Revision: 15350
Log:
Deleting the lib directory that holds opensaml2.0 rc jars.
They have uploaded the artifacts to the jboss repository.
Fixing the build accordingly.
Removed:
trunk/solutions/identity/lib/
Modified:
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
trunk/solutions/identity/modules/identity-provider/pom.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilder.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilder.java
trunk/solutions/identity/modules/token-verifier-core/pom.xml
trunk/solutions/identity/pom.xml
Modified:
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
(original)
+++ trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
Sun Mar 30 23:56:06 2008
@@ -98,9 +98,9 @@
<include>commons-lang:commons-lang:jar</include>
<include>joda-time:joda-time:jar</include>
<include>velocity:velocity:jar</include>
- <include>org.opensaml:opensaml:jar</include>
- <include>org.opensaml:openws:jar</include>
- <include>org.opensaml:xmltooling:jar</include>
+ <include>opensaml:opensaml2:jar</include>
+ <include>opensaml:openws:jar</include>
+ <include>opensaml:xmltooling:jar</include>
</includes>
</dependencySet>
Modified: trunk/solutions/identity/modules/identity-provider/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/pom.xml (original)
+++ trunk/solutions/identity/modules/identity-provider/pom.xml Sun Mar 30
23:56:06 2008
@@ -143,29 +143,23 @@
<version>${velocity.version}</version>
</dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
- <systemPath>${basedir}/../../lib/opensaml-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml2</artifactId>
+ <version>${opensaml2.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>openws</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
- <systemPath>${basedir}/../../lib/openws-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>openws</artifactId>
+ <version>${openws.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
-
<systemPath>${basedir}/../../lib/xmltooling-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>${xmltooling.version}</version>
+ </dependency>
<!-- End opensaml-2.0 jars -->
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilder.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilder.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilder.java
Sun Mar 30 23:56:06 2008
@@ -34,6 +34,7 @@
import org.opensaml.xml.security.x509.X509Credential;
import org.opensaml.xml.signature.KeyInfo;
import org.opensaml.xml.signature.Signature;
+import org.opensaml.xml.signature.SignatureException;
import org.opensaml.xml.signature.Signer;
import org.opensaml.xml.signature.X509Certificate;
import org.opensaml.xml.signature.X509Data;
@@ -168,6 +169,9 @@
} catch (MarshallingException e) {
log.debug(e);
throw new IdentityProviderException("errorMarshellingOrSigning",
e);
+ } catch (SignatureException e){
+ log.debug(e);
+ throw new IdentityProviderException("errorMarshellingOrSigning",
e);
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilder.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilder.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilder.java
Sun Mar 30 23:56:06 2008
@@ -37,6 +37,7 @@
import org.opensaml.xml.security.x509.X509Credential;
import org.opensaml.xml.signature.KeyInfo;
import org.opensaml.xml.signature.Signature;
+import org.opensaml.xml.signature.SignatureException;
import org.opensaml.xml.signature.Signer;
import org.opensaml.xml.signature.X509Certificate;
import org.opensaml.xml.signature.X509Data;
@@ -186,6 +187,9 @@
} catch (MarshallingException e) {
log.debug(e);
throw new IdentityProviderException("errorMarshellingOrSigning",
e);
+ } catch (SignatureException e){
+ log.debug(e);
+ throw new IdentityProviderException("errorMarshellingOrSigning",
e);
}
}
Modified: trunk/solutions/identity/modules/token-verifier-core/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/token-verifier-core/pom.xml
(original)
+++ trunk/solutions/identity/modules/token-verifier-core/pom.xml Sun Mar
30 23:56:06 2008
@@ -113,31 +113,24 @@
</exclusions>
<version>${velocity.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
- <systemPath>${basedir}/../../lib/opensaml-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml2</artifactId>
+ <version>${opensaml2.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
- <systemPath>${basedir}/../../lib/openws-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>openws</artifactId>
+ <version>${openws.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.0-rc1</version>
- <scope>system</scope>
-
<systemPath>${basedir}/../../lib/xmltooling-2.0-rc1.jar</systemPath>
- </dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>${xmltooling.version}</version>
+ </dependency>
<!-- End opensaml-2.0 jars -->
Modified: trunk/solutions/identity/pom.xml
==============================================================================
--- trunk/solutions/identity/pom.xml (original)
+++ trunk/solutions/identity/pom.xml Sun Mar 30 23:56:06 2008
@@ -140,6 +140,21 @@
<url>http://alchim.sourceforge.net/download/snapshots</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>jboss</id>
+ <name>JBoss Repo</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
</repositories>
@@ -498,7 +513,7 @@
<groupId>opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -823,6 +838,9 @@
<openid.version>0.9.5-SNAPSHOT</openid.version>
<slf4j.version>1.4.3</slf4j.version>
<jodatime.version>1.5.1</jodatime.version>
- <velocity.version>1.5</velocity.version>
+ <velocity.version>1.5</velocity.version>
+ <opensaml2.version>2.0-alpha1</opensaml2.version>
+ <openws.version>1.0</openws.version>
+ <xmltooling.version>1.0</xmltooling.version>
</properties>
</project>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
