Picketlink SVN: r1388 - product/tags.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 18:02:36 -0500 (Tue, 07 Feb 2012)
New Revision: 1388
Added:
product/tags/picketlink-eap6-2.0.3/
Log:
tag
12 years, 10 months
Picketlink SVN: r1387 - product/tags.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 18:01:48 -0500 (Tue, 07 Feb 2012)
New Revision: 1387
Removed:
product/tags/picketlink-eap6-2.0.3/
Log:
redo tag
12 years, 10 months
Picketlink SVN: r1386 - in product/branches/Branch_6_plus: parent and 5 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 18:01:25 -0500 (Tue, 07 Feb 2012)
New Revision: 1386
Modified:
product/branches/Branch_6_plus/parent/pom.xml
product/branches/Branch_6_plus/picketlink-core/pom.xml
product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml
product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml
product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts/pom.xml
product/branches/Branch_6_plus/picketlink-webapps/pom.xml
product/branches/Branch_6_plus/pom.xml
Log:
change version for tagging
Modified: product/branches/Branch_6_plus/parent/pom.xml
===================================================================
--- product/branches/Branch_6_plus/parent/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/parent/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<name>PicketLink Federation- Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink 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/picketlink/product/tags/2.0.3-SNAP...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.3-SNAPSHOT</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.3</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.3</developerConnection>
</scm>
<build>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: product/branches/Branch_6_plus/picketlink-core/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>../</relativePath>
</parent>
Modified: product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>../</relativePath>
</parent>
Modified: product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>../</relativePath>
</parent>
Modified: product/branches/Branch_6_plus/picketlink-webapps/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/picketlink-webapps/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/branches/Branch_6_plus/pom.xml
===================================================================
--- product/branches/Branch_6_plus/pom.xml 2012-02-07 22:59:55 UTC (rev 1385)
+++ product/branches/Branch_6_plus/pom.xml 2012-02-07 23:01:25 UTC (rev 1386)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product.eap</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.3</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 10 months
Picketlink SVN: r1385 - in product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings: servlets and 1 other directory.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:59:55 -0500 (Tue, 07 Feb 2012)
New Revision: 1385
Modified:
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java
Log:
changes due to servlet3 api
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java 2012-02-07 22:59:33 UTC (rev 1384)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java 2012-02-07 22:59:55 UTC (rev 1385)
@@ -35,12 +35,19 @@
import java.util.Set;
import javax.naming.directory.DirContext;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
import org.apache.catalina.Authenticator;
import org.apache.catalina.Cluster;
@@ -1111,4 +1118,161 @@
public void setThreadBindingListener(ThreadBindingListener threadBindingListener)
{
}
+
+ @Override
+ public int getEffectiveMajorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int getEffectiveMinorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean setInitParameter(String name, String value)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, String className)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Servlet servlet)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public ServletRegistration getServletRegistration(String servletName)
+ {
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends ServletRegistration> getServletRegistrations()
+ {
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
+ {
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+ {
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+ {
+ return null;
+ }
+
+ @Override
+ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public FilterRegistration getFilterRegistration(String filterName)
+ {
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+ {
+ return null;
+ }
+
+ @Override
+ public SessionCookieConfig getSessionCookieConfig()
+ {
+ return null;
+ }
+
+ @Override
+ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+ {
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+ {
+ return null;
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+ {
+ return null;
+ }
+
+ @Override
+ public void addListener(String className)
+ {
+ }
+
+ @Override
+ public <T extends EventListener> void addListener(T t)
+ {
+ }
+
+ @Override
+ public void addListener(Class<? extends EventListener> listenerClass)
+ {
+ }
+
+ @Override
+ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public JspConfigDescriptor getJspConfigDescriptor()
+ {
+ return null;
+ }
+
+ @Override
+ public ClassLoader getClassLoader()
+ {
+ return null;
+ }
+
+ @Override
+ public void declareRoles(String... roleNames)
+ {
+ }
}
\ No newline at end of file
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java 2012-02-07 22:59:33 UTC (rev 1384)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java 2012-02-07 22:59:55 UTC (rev 1385)
@@ -31,7 +31,7 @@
* @author Anil.Saldhana(a)redhat.com
* @since Jan 28, 2009
*/
-@SuppressWarnings({"rawtypes"})
+@SuppressWarnings({"rawtypes","unchecked"})
public class TestServletConfig implements ServletConfig
{
private ServletContext sc;
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java 2012-02-07 22:59:33 UTC (rev 1384)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java 2012-02-07 22:59:55 UTC (rev 1385)
@@ -25,20 +25,29 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.EventListener;
import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
/**
* @author Anil.Saldhana(a)redhat.com
* @since Jan 28, 2009
*/
-@SuppressWarnings({ "rawtypes"})
+@SuppressWarnings({ "rawtypes","unchecked"})
public class TestServletContext implements ServletContext
{
private HashMap<String,String> params = new HashMap<String,String>();
@@ -167,4 +176,185 @@
public void setAttribute(String name, Object object)
{
}
+
+ @Override
+ public int getEffectiveMajorVersion()
+ {
+
+ return 0;
+ }
+
+ @Override
+ public int getEffectiveMinorVersion()
+ {
+
+ return 0;
+ }
+
+ @Override
+ public boolean setInitParameter(String name, String value)
+ {
+
+ return false;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, String className)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Servlet servlet)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+ {
+
+ return null;
+ }
+
+ @Override
+ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+ {
+
+ return null;
+ }
+
+ @Override
+ public ServletRegistration getServletRegistration(String servletName)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends ServletRegistration> getServletRegistrations()
+ {
+
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
+ {
+
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+ {
+
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+ {
+
+ return null;
+ }
+
+ @Override
+ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+ {
+
+ return null;
+ }
+
+ @Override
+ public FilterRegistration getFilterRegistration(String filterName)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+ {
+
+ return null;
+ }
+
+ @Override
+ public SessionCookieConfig getSessionCookieConfig()
+ {
+
+ return null;
+ }
+
+ @Override
+ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+ {
+
+
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+ {
+
+ return null;
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+ {
+
+ return null;
+ }
+
+ @Override
+ public void addListener(String className)
+ {
+
+
+ }
+
+ @Override
+ public <T extends EventListener> void addListener(T t)
+ {
+
+
+ }
+
+ @Override
+ public void addListener(Class<? extends EventListener> listenerClass)
+ {
+
+
+ }
+
+ @Override
+ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+ {
+
+ return null;
+ }
+
+ @Override
+ public JspConfigDescriptor getJspConfigDescriptor()
+ {
+
+ return null;
+ }
+
+ @Override
+ public ClassLoader getClassLoader()
+ {
+
+ return null;
+ }
+
+ @Override
+ public void declareRoles(String... roleNames)
+ {
+
+ }
}
\ No newline at end of file
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java 2012-02-07 22:59:33 UTC (rev 1384)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java 2012-02-07 22:59:55 UTC (rev 1385)
@@ -27,22 +27,31 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
/**
* @author Anil.Saldhana(a)redhat.com
* @since Jan 28, 2009
*/
-@SuppressWarnings({ "rawtypes"})
+@SuppressWarnings({ "rawtypes","unchecked"})
public class TestServletRequest implements HttpServletRequest
{
private BufferedInputStream is = null;
@@ -325,5 +334,90 @@
public void setCharacterEncoding(String env) throws UnsupportedEncodingException
{
+ }
+
+ @Override
+ public ServletContext getServletContext()
+ {
+
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException
+ {
+
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IllegalStateException
+ {
+
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted()
+ {
+
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported()
+ {
+
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext()
+ {
+
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType()
+ {
+
+ return null;
+ }
+
+ @Override
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
+ {
+
+ return false;
+ }
+
+ @Override
+ public void login(String username, String password) throws ServletException
+ {
+
+
+ }
+
+ @Override
+ public void logout() throws ServletException
+ {
+
+
+ }
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException
+ {
+
+ return null;
+ }
+
+ @Override
+ public Part getPart(String name) throws IOException, ServletException
+ {
+
+ return null;
}
}
\ No newline at end of file
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java 2012-02-07 22:59:33 UTC (rev 1384)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java 2012-02-07 22:59:55 UTC (rev 1385)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
@@ -192,5 +193,33 @@
public void setLocale(Locale loc)
{
+ }
+
+ @Override
+ public int getStatus()
+ {
+
+ return 0;
+ }
+
+ @Override
+ public String getHeader(String name)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Collection<String> getHeaders(String name)
+ {
+
+ return null;
+ }
+
+ @Override
+ public Collection<String> getHeaderNames()
+ {
+
+ return null;
}
}
12 years, 10 months
Picketlink SVN: r1384 - product/branches/Branch_6_plus/picketlink-core.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:59:33 -0500 (Tue, 07 Feb 2012)
New Revision: 1384
Modified:
product/branches/Branch_6_plus/picketlink-core/pom.xml
Log:
use servlet3 api
Modified: product/branches/Branch_6_plus/picketlink-core/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-07 22:46:39 UTC (rev 1383)
+++ product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-07 22:59:33 UTC (rev 1384)
@@ -49,8 +49,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.1.0.GA</version>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.1.0.GA</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -75,9 +75,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -91,12 +91,6 @@
<artifactId>persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>annotations-api</artifactId>
- <version>6.0.18</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
<artifactId>jboss-jacc-api_1.4_spec</artifactId>
<version>1.0.0.Final</version>
12 years, 10 months
Picketlink SVN: r1383 - product/branches.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:46:39 -0500 (Tue, 07 Feb 2012)
New Revision: 1383
Added:
product/branches/Branch_6_plus/
Log:
bring back deleted branch
12 years, 10 months
Picketlink SVN: r1382 - product/branches.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:46:09 -0500 (Tue, 07 Feb 2012)
New Revision: 1382
Removed:
product/branches/Branch_6_plus/
Log:
delete old branch
12 years, 10 months
Picketlink SVN: r1381 - product/branches.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:43:52 -0500 (Tue, 07 Feb 2012)
New Revision: 1381
Added:
product/branches/Branch_6_plus/
Log:
bring back deleted branch
12 years, 10 months
Picketlink SVN: r1380 - product/branches.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:39:00 -0500 (Tue, 07 Feb 2012)
New Revision: 1380
Removed:
product/branches/Branch_6_plus/
Log:
delete old branch
12 years, 10 months
Picketlink SVN: r1379 - in product/branches/Branch_6_plus/picketlink-core/src: main/java/org/picketlink/identity/federation/bindings/tomcat/sp and 1 other directories.
by picketlink-commits@lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2012-02-07 17:37:52 -0500 (Tue, 07 Feb 2012)
New Revision: 1379
Modified:
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/TomcatRoleGenerator.java
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SAML11SPRedirectFormAuthenticator.java
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java
product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java
Log:
JBossWeb7 related changes
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -103,8 +103,7 @@
{
this.subjectInteractionClassName = subjectRetrieverClassName;
}
-
- @Override
+
public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException
{
log.trace("Authenticating user");
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/TomcatRoleGenerator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/TomcatRoleGenerator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/TomcatRoleGenerator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -24,11 +24,8 @@
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
-import org.apache.catalina.Role;
-import org.apache.catalina.User;
import org.apache.catalina.realm.GenericPrincipal;
import org.picketlink.identity.federation.core.ErrorCodes;
import org.picketlink.identity.federation.core.interfaces.RoleGenerator;
@@ -44,7 +41,7 @@
* @see RoleGenerator#generateRoles(Principal)
* @throws IllegalArgumentException if principal is not of type GenericPrincipal or User
*/
- public List<String> generateRoles(Principal principal)
+ /*public List<String> generateRoles(Principal principal)
{
String className = principal.getClass().getCanonicalName();
@@ -70,5 +67,28 @@
}
}
return userRoles;
+ }*/
+
+
+ /**
+ * @see RoleGenerator#generateRoles(Principal)
+ * @throws IllegalArgumentException if principal is not of type GenericPrincipal or User
+ */
+ public List<String> generateRoles(Principal principal)
+ {
+ String className = principal.getClass().getCanonicalName();
+
+ if (principal instanceof GenericPrincipal == false)
+ throw new IllegalArgumentException(ErrorCodes.WRONG_TYPE + "principal is not tomcat principal:" + className);
+ List<String> userRoles = new ArrayList<String>();
+
+ if (principal instanceof GenericPrincipal)
+ {
+ GenericPrincipal gp = (GenericPrincipal) principal;
+ String[] roles = gp.getRoles();
+ if (roles.length > 0)
+ userRoles.addAll(Arrays.asList(roles));
+ }
+ return userRoles;
}
}
\ No newline at end of file
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -249,7 +249,6 @@
* call and save it. Subsquent invocations utilize the saved {@link Method}
* @see org.apache.catalina.authenticator.AuthenticatorBase#register(org.apache.catalina.connector.Request, org.apache.catalina.connector.Response, java.security.Principal, java.lang.String, java.lang.String, java.lang.String)
*/
- @Override
protected void register(Request request, Response response, Principal principal, String arg3, String arg4,
String arg5)
{
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SAML11SPRedirectFormAuthenticator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SAML11SPRedirectFormAuthenticator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SAML11SPRedirectFormAuthenticator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -29,6 +29,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.connector.Request;
@@ -139,7 +141,7 @@
{
this.restoreRequest(request, session);
}
- register(request, response, principal, Constants.FORM_METHOD, username, password);
+ register(request, response, principal, HttpServletRequest.FORM_AUTH, username, password);
return true;
}
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -30,6 +30,7 @@
import java.util.Set;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Session;
@@ -115,7 +116,6 @@
throw new RuntimeException(ErrorCodes.SERVICE_PROVIDER_NOT_CATALINA_RESPONSE);
}
- @Override
public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException
{
Session session = request.getSessionInternal(true);
@@ -306,7 +306,7 @@
{
this.restoreRequest(request, session);
}
- register(request, response, principal, Constants.FORM_METHOD, username, password);
+ register(request, response, principal, HttpServletRequest.FORM_AUTH, username, password);
return true;
}
Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -32,6 +32,7 @@
import java.util.StringTokenizer;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Session;
@@ -106,8 +107,7 @@
}
throw new RuntimeException(ErrorCodes.SERVICE_PROVIDER_NOT_CATALINA_RESPONSE);
}
-
- @Override
+
public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException
{
Session session = request.getSessionInternal(true);
@@ -322,7 +322,7 @@
{
this.restoreRequest(request, session);
}
- register(request, response, principal, Constants.FORM_METHOD, username, password);
+ register(request, response, principal, HttpServletRequest.FORM_AUTH, username, password);
return true;
}
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -27,6 +27,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.EventListener;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -41,6 +42,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.apache.catalina.Authenticator;
import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
@@ -49,6 +51,7 @@
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
+import org.apache.catalina.ThreadBindingListener;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -56,12 +59,15 @@
import org.apache.catalina.deploy.ErrorPage;
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
+import org.apache.catalina.deploy.JspPropertyGroup;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.deploy.SessionCookie;
+import org.apache.catalina.deploy.jsp.TagLibraryInfo;
import org.apache.catalina.util.CharsetMapper;
-import org.apache.juli.logging.Log;
+import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.http.mapper.Mapper;
+import org.jboss.logging.Logger;
/**
* Mock Catalina Context
@@ -131,12 +137,6 @@
throw new RuntimeException("NYI");
}
- public Log getLogger()
- {
-
- throw new RuntimeException("NYI");
- }
-
public Manager getManager()
{
@@ -536,11 +536,6 @@
throw new RuntimeException("NYI");
}
- public NamingResources getNamingResources()
- {
- throw new RuntimeException("NYI");
- }
-
public boolean getOverride()
{
return false;
@@ -734,10 +729,6 @@
{
}
- public void setNamingResources(NamingResources arg0)
- {
- }
-
public void setOverride(boolean arg0)
{
}
@@ -961,4 +952,163 @@
{
this.attribs.put(arg0, arg1);
}
+
+ @Override
+ public boolean isStarted()
+ {
+ return false;
+ }
+
+ @Override
+ public Logger getLogger()
+ {
+ return null;
+ }
+
+ @Override
+ public void fireContainerEvent(String type, Object data)
+ {
+ }
+
+ @Override
+ public void addSessionTrackingMode(String trackingMode)
+ {
+ }
+
+ @Override
+ public Authenticator getAuthenticator()
+ {
+ return null;
+ }
+
+ @Override
+ public void setAuthenticator(Authenticator authenticator)
+ {
+ }
+
+ @Override
+ public Object[] getApplicationSessionLifecycleListeners()
+ {
+ return null;
+ }
+
+ @Override
+ public void setApplicationSessionLifecycleListeners(Object[] listeners)
+ {
+ }
+
+ @Override
+ public boolean isStarting()
+ {
+ return false;
+ }
+
+ @Override
+ public void setStarting(boolean starting)
+ {
+ }
+
+ @Override
+ public void setSessionCookie(SessionCookie sessionCookie)
+ {
+ }
+
+ @Override
+ public SessionCookie getSessionCookie()
+ {
+ return null;
+ }
+
+ @Override
+ public InstanceManager getInstanceManager()
+ {
+ return null;
+ }
+
+ @Override
+ public void setInstanceManager(InstanceManager instanceManager)
+ {
+ }
+
+ @Override
+ public String getLogicalName()
+ {
+ return null;
+ }
+
+ @Override
+ public void setLogicalName(String logicalName)
+ {
+ }
+
+ @Override
+ public String getVersion()
+ {
+ return null;
+ }
+
+ @Override
+ public int getVersionMajor()
+ {
+ return 0;
+ }
+
+ @Override
+ public int getVersionMinor()
+ {
+ return 0;
+ }
+
+ @Override
+ public void setVersion(String version)
+ {
+ }
+
+ @Override
+ public <T extends EventListener> void addApplicationListenerInstance(T listener)
+ {
+ }
+
+ @Override
+ public void addFilterMapBefore(FilterMap filterMap)
+ {
+ }
+
+ @Override
+ public void addJspPropertyGroup(JspPropertyGroup propertyGroup)
+ {
+ }
+
+ @Override
+ public void addJspTagLibrary(TagLibraryInfo tagLibraryInfo)
+ {
+ }
+
+ @Override
+ public void addJspTagLibrary(String uri, TagLibraryInfo tagLibraryInfo)
+ {
+ }
+
+ @Override
+ public JspPropertyGroup[] findJspPropertyGroups()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isInitialized()
+ {
+ return false;
+ }
+
+ @Override
+ public ThreadBindingListener getThreadBindingListener()
+ {
+ return null;
+ }
+
+ @Override
+ public void setThreadBindingListener(ThreadBindingListener threadBindingListener)
+ {
+ }
}
\ No newline at end of file
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -94,6 +94,8 @@
@Override
public PrintWriter getWriter() throws IOException
{
+ if(mywriter == null)
+ mywriter = applicationWriter;
return this.mywriter;
}
Modified: product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java 2012-02-07 22:37:18 UTC (rev 1378)
+++ product/branches/Branch_6_plus/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java 2012-02-07 22:37:52 UTC (rev 1379)
@@ -291,4 +291,10 @@
{
this.notes.clear();
}
+
+ @Override
+ public boolean isValidInternal()
+ {
+ return false;
+ }
}
\ No newline at end of file
12 years, 10 months