[jboss-cvs] Picketlink SVN: r1398 - in product/branches/Branch_6_plus/picketlink-webapps: idp/src/main/webapp/WEB-INF and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 16 04:32:43 EST 2012 

Author: pskopek at redhat.com
Date: 2012-02-16 04:32:42 -0500 (Thu, 16 Feb 2012)
New Revision: 1398

Added:
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/pdp/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/pdp/SOAPSAMLXACMLPDPService.java
Modified:
   product/branches/Branch_6_plus/picketlink-webapps/idp/
   product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml
   product/branches/Branch_6_plus/picketlink-webapps/idp/src/main/webapp/WEB-INF/web.xml
   product/branches/Branch_6_plus/picketlink-webapps/pdp/
   product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/META-INF/jboss-deployment-structure.xml
   product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/WEB-INF/web.xml
Log:
idp.war and pdp.war fixes to make them load under AS7/EAP6.
pdp.war requires usage os jbossxacml newer than 2.0.6.Final.


Property changes on: product/branches/Branch_6_plus/picketlink-webapps/idp
___________________________________________________________________
Modified: svn:ignore
   - .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata

   + .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
.externalToolBuilders


Modified: product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml	2012-02-15 20:03:53 UTC (rev 1397)
+++ product/branches/Branch_6_plus/picketlink-webapps/idp/pom.xml	2012-02-16 09:32:42 UTC (rev 1398)
@@ -27,12 +27,19 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.2</version>
           <configuration>
             <warName>idp</warName>
             <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
           </configuration>
         </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
      </plugins>
   </build>
 </project>

Modified: product/branches/Branch_6_plus/picketlink-webapps/idp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/idp/src/main/webapp/WEB-INF/web.xml	2012-02-15 20:03:53 UTC (rev 1397)
+++ product/branches/Branch_6_plus/picketlink-webapps/idp/src/main/webapp/WEB-INF/web.xml	2012-02-16 09:32:42 UTC (rev 1398)
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app 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_2_5.xsd"
-   version="2.5"> 
+<?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">
 
   <display-name>IDP</display-name>
   <description>


Property changes on: product/branches/Branch_6_plus/picketlink-webapps/pdp
___________________________________________________________________
Modified: svn:ignore
   - .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata

   + .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
.externalToolBuilders


Modified: product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml	2012-02-15 20:03:53 UTC (rev 1397)
+++ product/branches/Branch_6_plus/picketlink-webapps/pdp/pom.xml	2012-02-16 09:32:42 UTC (rev 1398)
@@ -27,12 +27,26 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.2</version>
           <configuration>
             <warName>pdp</warName>
-            <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+            <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
           </configuration>
         </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
      </plugins>
   </build>
+   <dependencies>
+   	<dependency>
+	    <groupId>org.picketlink.product.eap</groupId>
+   		<artifactId>picketlink-core</artifactId>
+   		<version>${project.parent.version}</version>
+   	</dependency>
+   </dependencies>
 </project>

Added: product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/pdp/SOAPSAMLXACMLPDPService.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/pdp/SOAPSAMLXACMLPDPService.java	                        (rev 0)
+++ product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/java/org/picketlink/identity/federation/app/pdp/SOAPSAMLXACMLPDPService.java	2012-02-16 09:32:42 UTC (rev 1398)
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+package org.picketlink.identity.federation.app.pdp;
+
+
+
+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.pdp.SOAPSAMLXACMLPDP;
+
+
+/**
+ * <p>
+ * Default implementation of the {@code SecurityTokenService} interface.
+ * </p>
+ * 
+ * @author Anil.Saldhana at redhat.com
+ * @author <a href="mailto:pskopek at redhat.com">Peter Skopek</a>
+ */
+ at WebServiceProvider(serviceName = "SOAPSAMLXACMLPDP", portName = "SOAPSAMLXACMLPort", targetNamespace = "urn:picketlink:identity-federation:pdp", wsdlLocation = "WEB-INF/wsdl/SOAPSAMLXACMLPDP.wsdl")
+ at ServiceMode(value = Service.Mode.MESSAGE)
+public class SOAPSAMLXACMLPDPService extends SOAPSAMLXACMLPDP
+{
+
+   @Resource
+   protected WebServiceContext context;
+   
+  
+}
\ No newline at end of file

Modified: product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/META-INF/jboss-deployment-structure.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/META-INF/jboss-deployment-structure.xml	2012-02-15 20:03:53 UTC (rev 1397)
+++ product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/META-INF/jboss-deployment-structure.xml	2012-02-16 09:32:42 UTC (rev 1398)
@@ -3,9 +3,8 @@
   <deployment>
     <!-- Add picketlink module dependency -->
     <dependencies>
-      <module name="org.jboss.security.xacml" />
       <module name="org.picketlink" />
-      <module name="org.picketbox" />
+      <module name="org.jboss.security.xacml" />
     </dependencies>
   </deployment>
 </jboss-deployment-structure>

Modified: product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/WEB-INF/web.xml	2012-02-15 20:03:53 UTC (rev 1397)
+++ product/branches/Branch_6_plus/picketlink-webapps/pdp/src/main/webapp/WEB-INF/web.xml	2012-02-16 09:32:42 UTC (rev 1398)
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app 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_2_5.xsd"
-   version="2.5">
+<?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">
 
    <display-name>PDP Endpoint</display-name>
    <description>
@@ -31,7 +32,7 @@
    
    <servlet>
      <servlet-name>SOAPSAMLXACMLPDPServlet</servlet-name>
-     <servlet-class>org.picketlink.identity.federation.core.pdp.SOAPSAMLXACMLPDP</servlet-class>
+     <servlet-class>org.picketlink.identity.federation.app.pdp.SOAPSAMLXACMLPDPService</servlet-class>
    </servlet>
    <servlet-mapping>
       <servlet-name>SOAPSAMLXACMLPDPServlet</servlet-name>

More information about the jboss-cvs-commits mailing list