5:57 p.m.
Author: anil.saldhana(a)jboss.com
Date: 2012-01-10 18:57:36 -0500 (Tue, 10 Jan 2012)
New Revision: 1340
Modified:
social/trunk/assembly/pom.xml
social/trunk/facebook/pom.xml
social/trunk/openid/pom.xml
social/trunk/openid/src/main/java/org/picketlink/social/openid/api/OpenIDManager.java
social/trunk/parent/pom.xml
social/trunk/pom.xml
social/trunk/social/pom.xml
social/trunk/webapps/openid-consumer/pom.xml
social/trunk/webapps/openid-provider/pom.xml
social/trunk/webapps/picketlink-reg/pom.xml
social/trunk/webapps/pom.xml
Log:
post beta1
Modified: social/trunk/assembly/pom.xml
===================================================================
--- social/trunk/assembly/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/assembly/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: social/trunk/facebook/pom.xml
===================================================================
--- social/trunk/facebook/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/facebook/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>picketlink-social-parent</artifactId>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: social/trunk/openid/pom.xml
===================================================================
--- social/trunk/openid/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/openid/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>picketlink-social-parent</artifactId>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -106,6 +106,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
+ <version>6.1.18</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,9 +140,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -153,6 +154,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
social/trunk/openid/src/main/java/org/picketlink/social/openid/api/OpenIDManager.java
===================================================================
---
social/trunk/openid/src/main/java/org/picketlink/social/openid/api/OpenIDManager.java 2012-01-02
16:55:08 UTC (rev 1339)
+++
social/trunk/openid/src/main/java/org/picketlink/social/openid/api/OpenIDManager.java 2012-01-10
23:57:36 UTC (rev 1340)
@@ -82,18 +82,10 @@
public OpenIDManager(OpenIDRequest theReq)
{
this.request = theReq;
- try
- {
- consumerManager = new ConsumerManager();
- consumerManager.setAssociations(new InMemoryConsumerAssociationStore());
- consumerManager.setNonceVerifier(new InMemoryNonceVerifier(5000));
-
- userString = request.getURL();
- }
- catch(ConsumerException ce)
- {
- throw new RuntimeException(ce);
- }
+ consumerManager = new ConsumerManager();
+ consumerManager.setAssociations(new InMemoryConsumerAssociationStore());
+ consumerManager.setNonceVerifier(new InMemoryNonceVerifier(5000));
+ userString = request.getURL();
}
/**
@@ -430,4 +422,4 @@
return this.providers != null ? providers.size() : 0;
}
}
-}
\ No newline at end of file
+}
Modified: social/trunk/parent/pom.xml
===================================================================
--- social/trunk/parent/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/parent/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -8,7 +8,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<name>PicketLink Social - Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink Social Parent</description>
@@ -102,6 +102,29 @@
<artifactId>openid4java-nodeps</artifactId>
<version>0.9.6</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.18</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.18</version>
+ <scope>test</scope>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: social/trunk/pom.xml
===================================================================
--- social/trunk/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: social/trunk/social/pom.xml
===================================================================
--- social/trunk/social/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/social/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.picketlink</groupId>
- <artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>picketlink-social-parent</artifactId>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: social/trunk/webapps/openid-consumer/pom.xml
===================================================================
--- social/trunk/webapps/openid-consumer/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/webapps/openid-consumer/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: social/trunk/webapps/openid-provider/pom.xml
===================================================================
--- social/trunk/webapps/openid-provider/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/webapps/openid-provider/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: social/trunk/webapps/picketlink-reg/pom.xml
===================================================================
--- social/trunk/webapps/picketlink-reg/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/webapps/picketlink-reg/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: social/trunk/webapps/pom.xml
===================================================================
--- social/trunk/webapps/pom.xml 2012-01-02 16:55:08 UTC (rev 1339)
+++ social/trunk/webapps/pom.xml 2012-01-10 23:57:36 UTC (rev 1340)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-social-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.Beta1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>