jboss-switchyard · kcbabo · Sep 27, 2012 · Aug 21, 2012
diff --git a/jboss-as7/modules/pom.xml b/jboss-as7/modules/pom.xml
@@ -152,6 +152,10 @@
             <groupId>org.switchyard</groupId>
             <artifactId>switchyard-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.switchyard</groupId>
+            <artifactId>switchyard-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.switchyard</groupId>
             <artifactId>switchyard-bus-camel</artifactId>
@@ -255,6 +259,18 @@
         </dependency>
         -->
 
+        <!--
+        PicketLink...
+        -->
+        <dependency>
+           <groupId>org.picketlink</groupId>
+           <artifactId>picketlink-core</artifactId>
+        </dependency>
+        <dependency>
+           <groupId>org.picketlink.distribution</groupId>
+           <artifactId>picketlink-jbas7</artifactId>
+        </dependency>
+
         <!--
         Riftsaw...
         -->

diff --git a/jboss-as7/modules/src/main/resources/external/assembly-component.xml b/jboss-as7/modules/src/main/resources/external/assembly-component.xml
@@ -21,6 +21,11 @@
            xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
 
     <files>
+        <file>
+            <source>src/main/resources/external/picketlink/module.xml</source>
+            <outputDirectory>/modules/org/picketlink/main</outputDirectory>
+            <filtered>true</filtered>
+        </file>
         <file>
             <source>src/main/resources/external/milyn/module.xml</source>
             <outputDirectory>/modules/org/milyn/main</outputDirectory>
@@ -186,6 +191,22 @@
         </file>
     </files>
     <dependencySets>
+        <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.picketlink:picketlink-core</include>
+            </includes>
+            <outputDirectory>/modules/org/picketlink/main</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${version.picketlink}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.picketlink.distribution:picketlink-jbas7</include>
+            </includes>
+            <outputDirectory>/modules/org/picketlink/main</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${version.picketlink}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
         <dependencySet>
             <useTransitiveDependencies>false</useTransitiveDependencies>
             <includes>

diff --git a/jboss-as7/modules/src/main/resources/external/picketlink/module.xml b/jboss-as7/modules/src/main/resources/external/picketlink/module.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source
+  ~ Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
+  ~ as indicated by the @author tags. All rights reserved.
+  ~ See the copyright.txt in the distribution for a
+  ~ full listing of individual contributors.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use,
+  ~ modify, copy, or redistribute it subject to the terms and conditions
+  ~ of the GNU Lesser General Public License, v. 2.1.
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT A
+  ~ 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,
+  ~ v.2.1 along with this distribution; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  ~ MA  02110-1301, USA.
+  -->
+<module xmlns="urn:jboss:module:1.0" name="org.picketlink">
+    <resources>
+        <resource-root path="picketlink-jbas7-${version.picketlink}.jar"/>
+        <resource-root path="picketlink-core-${version.picketlink}.jar"/>
+    </resources>
+    <dependencies>
+        <module name="javax.annotation.api"/>
+        <module name="org.jboss.staxmapper"/>
+        <module name="org.jboss.as.controller"/>
+        <module name="org.jboss.as.server"/>
+        <module name="org.jboss.modules"/>
+        <module name="org.jboss.msc"/>
+        <module name="org.jboss.logging"/>
+        <module name="org.jboss.vfs"/>
+        <module name="org.jboss.metadata"/>
+        <module name="org.jboss.as.naming"/>
+        <module name="org.jboss.as.security"/>
+        <module name="org.jboss.as.webservices"/>
+        <module name="org.jboss.ws.spi"/>
+        <module name="org.apache.cxf"/>
+        <module name="org.apache.ws.security"/>
+        <module name="javax.wsdl4j.api"/>
+        <module name="javax.security.auth.message.api"/>
+        <module name="javax.security.jacc.api"/>
+        <module name="javax.transaction.api"/>
+        <module name="javax.xml.bind.api"/>
+        <module name="javax.xml.stream.api"/>
+        <module name="javax.servlet.api"/>
+        <module name="org.jboss.common-core"/>
+        <module name="org.jboss.logging"/>
+        <module name="org.jboss.as.web"/>
+        <module name="org.jboss.security.xacml"/>
+        <module name="org.picketbox"/>
+        <module name="javax.xml.ws.api"/>
+        <module name="org.apache.log4j"/>
+        <module name="org.apache.santuario.xmlsec"/>
+        <module name="javax.api"/>
+    </dependencies>
+</module>
diff --git a/jboss-as7/modules/src/main/resources/switchyard/components/common/resources/module.xml b/jboss-as7/modules/src/main/resources/switchyard/components/common/resources/module.xml
@@ -31,5 +31,6 @@
         <module name="org.switchyard.common"/>
         <module name="org.switchyard.config"/>
         <module name="org.switchyard.deploy"/>
+        <module name="org.switchyard.security" export="true"/>
     </dependencies>
 </module>
diff --git a/jboss-as7/modules/src/main/resources/switchyard/components/http/resources/module.xml b/jboss-as7/modules/src/main/resources/switchyard/components/http/resources/module.xml
@@ -36,5 +36,6 @@
         <module name="org.switchyard.config"/>
         <module name="org.switchyard.component.common"/>
         <module name="org.switchyard.deploy"/>
+        <module name="org.switchyard.security" export="true"/>
     </dependencies>
 </module>
diff --git a/jboss-as7/modules/src/main/resources/switchyard/components/soap/resources/module.xml b/jboss-as7/modules/src/main/resources/switchyard/components/soap/resources/module.xml
@@ -41,5 +41,6 @@
         <module name="org.switchyard.component.common"/>
         <module name="org.switchyard.component.soap.ws-impl"/>
         <module name="org.switchyard.component.soap.saaj-impl"/>
+        <module name="org.switchyard.security" export="true"/>
     </dependencies>
 </module>
diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/assembly-component.xml b/jboss-as7/modules/src/main/resources/switchyard/core/assembly-component.xml
@@ -55,6 +55,11 @@
             <outputDirectory>/modules/org/switchyard/runtime/main</outputDirectory>
             <filtered>true</filtered>
         </file>
+        <file>
+            <source>src/main/resources/switchyard/core/security/module.xml</source>
+            <outputDirectory>/modules/org/switchyard/security/main</outputDirectory>
+            <filtered>true</filtered>
+        </file>
         <file>
             <source>src/main/resources/switchyard/core/transform/module.xml</source>
             <outputDirectory>/modules/org/switchyard/transform/main</outputDirectory>
@@ -167,6 +172,15 @@
             <outputDirectory>/modules/org/switchyard/runtime/main</outputDirectory>
             <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}
             </outputFileNameMapping>
+        </dependencySet>
+         <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.switchyard:switchyard-security</include>
+            </includes>
+            <outputDirectory>/modules/org/switchyard/security/main</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}
+            </outputFileNameMapping>
         </dependencySet>
         <dependencySet>
             <useTransitiveDependencies>false</useTransitiveDependencies>

diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/common/module.xml b/jboss-as7/modules/src/main/resources/switchyard/core/common/module.xml
@@ -30,6 +30,7 @@
 
     <dependencies>
         <module name="javax.api"/>
+        <module name="javax.xml.bind.api"/>
         <module name="javax.xml.stream.api"/>
         <module name="org.apache.log4j"/>
     </dependencies>

diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/deploy/module.xml b/jboss-as7/modules/src/main/resources/switchyard/core/deploy/module.xml
@@ -38,6 +38,7 @@
         <module name="org.switchyard.common-camel"/>
         <module name="org.switchyard.config"/>
         <module name="org.switchyard.runtime"/>
+        <module name="org.switchyard.security" export="true"/>
         <module name="org.switchyard.transform"/>
         <module name="org.switchyard.validate"/>
     </dependencies>

diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/module.xml b/jboss-as7/modules/src/main/resources/switchyard/core/module.xml
@@ -53,6 +53,7 @@
         <module name="org.switchyard.config"/>
         <module name="org.switchyard.deploy"/>
         <module name="org.switchyard.runtime"/>
+        <module name="org.switchyard.security" export="true"/>
         <module name="org.switchyard.component.http"/>
         <module name="org.switchyard.component.resteasy"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>

diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/runtime/module.xml b/jboss-as7/modules/src/main/resources/switchyard/core/runtime/module.xml
@@ -34,5 +34,6 @@
         <module name="org.apache.log4j"/>
         <module name="org.switchyard.api"/>
         <module name="org.switchyard.common"/>
+        <module name="org.switchyard.security" export="true"/>
     </dependencies>
 </module>
diff --git a/jboss-as7/modules/src/main/resources/switchyard/core/security/module.xml b/jboss-as7/modules/src/main/resources/switchyard/core/security/module.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., 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.
+  -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.switchyard.security">
+
+    <resources>
+        <resource-root path="switchyard-security-${project.version}.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.servlet.api"/>
+        <module name="javax.xml.ws.api"/>
+        <module name="org.apache.log4j"/>
+        <module name="org.jboss.com.sun.httpserver"/>
+        <module name="org.picketbox" export="true"/>
+        <module name="org.picketlink" export="true"/>
+        <module name="org.switchyard.api"/>
+        <module name="org.switchyard.common"/>
+    </dependencies>
+</module>
diff --git a/jboss-as7/pom.xml b/jboss-as7/pom.xml
@@ -231,7 +231,12 @@
         </dependency>
         <dependency>
             <groupId>org.switchyard.quickstarts.demos</groupId>
-            <artifactId>switchyard-quickstart-demo-policy-security</artifactId>
+            <artifactId>switchyard-quickstart-demo-policy-security-sslbasic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.switchyard.quickstarts.demos</groupId>
+            <artifactId>switchyard-quickstart-demo-policy-security-sslsaml</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/jboss-as7/standalone/bundle/xsl/standalone.xsl b/jboss-as7/standalone/bundle/xsl/standalone.xsl
@@ -26,7 +26,8 @@
     xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:xdt="http://www.w3.org/2005/xpath-datatypes"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    exclude-result-prefixes="xs xsl xsi fn xdt">
+    xmlns:as="urn:jboss:domain:1.2"
+    exclude-result-prefixes="xs xsl xsi fn xdt as">
 
 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 

diff --git a/jboss-as7/standalone/dist/assembly.xml b/jboss-as7/standalone/dist/assembly.xml
@@ -18,6 +18,7 @@
                 <exclude>META-INF/</exclude>
                 <exclude>xsl/</exclude>
                 <exclude>modules/org/jboss/as/console/main/jboss-as-console*-resources.jar</exclude>
+                <exclude>modules/org/picketlink/main/*2.0.2*.jar</exclude>
             </excludes>
             <fileMode>644</fileMode>
             <directoryMode>755</directoryMode>

diff --git a/...t/java/org/switchyard/test/quickstarts/demo/PolicySecuritySslBasicDemoQuickstartTest.java b/...t/java/org/switchyard/test/quickstarts/demo/PolicySecuritySslBasicDemoQuickstartTest.java
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.switchyard.test.quickstarts.demo;
+
+import junit.framework.Assert;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.switchyard.test.ArquillianUtil;
+
+/**
+ * The policy-security-sslbasic demo quickstart test.
+ *
+ * @author David Ward &lt;<a href="mailto:dward@jboss.org">dward@jboss.org</a>&gt; &copy; 2012 Red Hat Inc.
+ */
+@RunWith(Arquillian.class)
+public class PolicySecuritySslBasicDemoQuickstartTest {
+
+    @Deployment(testable = false)
+    public static JavaArchive createDeployment() {
+        return ArquillianUtil.createJarDemoDeployment("switchyard-quickstart-demo-policy-security-sslbasic");
+    }
+
+    @Test
+    public void test() throws Exception {
+        Assert.assertTrue(true);
+    }
+
+}
diff --git a/...emo/PolicySecurityDemoQuickstartTest.java → ...icySecuritySslSamlDemoQuickstartTest.java b/...emo/PolicySecurityDemoQuickstartTest.java → ...icySecuritySslSamlDemoQuickstartTest.java
@@ -28,16 +28,16 @@
 import org.switchyard.test.ArquillianUtil;
 
 /**
- * The policy-security demo quickstart test.
+ * The policy-security-sslsaml demo quickstart test.
  *
- * @author David Ward &lt;<a href="mailto:dward@jboss.org">dward@jboss.org</a>&gt; (C) 2012 Red Hat Inc.
+ * @author David Ward &lt;<a href="mailto:dward@jboss.org">dward@jboss.org</a>&gt; &copy; 2012 Red Hat Inc.
  */
 @RunWith(Arquillian.class)
-public class PolicySecurityDemoQuickstartTest {
+public class PolicySecuritySslSamlDemoQuickstartTest {
 
     @Deployment(testable = false)
     public static JavaArchive createDeployment() {
-        return ArquillianUtil.createJarDemoDeployment("switchyard-quickstart-demo-policy-security");
+        return ArquillianUtil.createJarDemoDeployment("switchyard-quickstart-demo-policy-security-sslsaml");
     }
 
     @Test