Author: pskopek(a)redhat.com Date: 2012-02-21 11:08:35 -0500 (Tue, 21 Feb 2012) New Revision: 1417 Added: federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml federation/trunk/picketlink-webapps/as7/picketlink-sts/src/main/webapp/WEB-INF/web.xml Log: Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java 2012-02-17 23:10:21 UTC (rev 1416) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java 2012-02-21 16:08:35 UTC (rev 1417) @@ -60,7 +60,7 @@ protected Logger log = Logger.getLogger(SOAPSAMLXACMLPDP.class); @Resource - WebServiceContext context; + protected WebServiceContext context; protected String policyConfigFileName = "policyConfig.xml"; Modified: federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-02-17 23:10:21 UTC (rev 1416) +++ federation/trunk/picketlink-webapps/as7/picketlink-sts/pom.xml 2012-02-21 16:08:35 UTC (rev 1417) @@ -9,7 +9,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-sts-as7</artifactId> <packaging>war</packaging> - <name>PicketLink Federation Security Token Service</name> + <name>PicketLink Federation Security Token Service for AS7</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Samples contains the samples for Federated Identity Needs.</description> <licenses> @@ -27,13 +27,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> + <version>2.2</version> <configuration> <warName>picketlink-sts</warName> - <!--webappDirectory>${basedir}/resources/</webappDirectory> - <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes--> + <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> </configuration> </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed-core</artifactId> + <version>${project.parent.version}</version> + </dependency> + </dependencies> </project> Modified: federation/trunk/picketlink-webapps/as7/picketlink-sts/src/main/webapp/WEB-INF/web.xml =================================================================== --- federation/trunk/picketlink-webapps/as7/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2012-02-17 23:10:21 UTC (rev 1416) +++ federation/trunk/picketlink-webapps/as7/picketlink-sts/src/main/webapp/WEB-INF/web.xml 2012-02-21 16:08:35 UTC (rev 1417) @@ -1,12 +1,13 @@ -<?xml version="1.0"?> -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<web-app + version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> -<web-app> <servlet> <servlet-name>PicketLinkSTS</servlet-name> - <servlet-class>org.picketlink.identity.federation.core.wstrust.PicketLinkSTS</servlet-class> + <servlet-class>org.picketlink.identity.federation.app.sts.PicketLinkSTService</servlet-class> </servlet> <servlet-mapping> <servlet-name>PicketLinkSTS</servlet-name> Added: federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java =================================================================== --- federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java (rev 0) +++ federation/trunk/picketlink-webapps/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java 2012-02-21 16:08:35 UTC (rev 1417) @@ -0,0 +1,45 @@ +package org.picketlink.identity.federation.app.sts; +/* + * JBoss, Home of Professional Open Source. Copyright 2009, 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. + */ + + +import javax.annotation.Resource; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceProvider; + +import org.picketlink.identity.federation.core.wstrust.PicketLinkSTS; + +/** + * <p> + * Default implementation of the {@code SecurityTokenService} interface. + * </p> + * + * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> + * @author <a href="mailto:pskopek@redhat.com">Peter Skopek</a> + */ +@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl") +@ServiceMode(value = Service.Mode.MESSAGE) +public class PicketLinkSTService extends PicketLinkSTS +{ + + @Resource + protected WebServiceContext context; + +} \ No newline at end of file