Added gridshib-common and gridshib-saml-tools.

gridshib/README.txt

@@ -0,0 +1,44 @@
+This was formerly an ant project that has been now Maven-ized.
+
+The code currently depends on the following that are not in standard
+Maven repositories:
+
+a. Globus opensaml 1.1 that apparently is OpenSAML 1.1 with some of
+   the fixes in OpenSAML 2.0 backported to 1.1.
+
+b. commons-cli 2.0 that was never released.
+
+c. An old version of Shibboleth utilities.
+
+The first 2 of the above have been inserted into a gridshib-common/repo
+and the last in gridshib-saml-tools/repo
+
+There are junit test cases that run in the standard way:
+
+mvn test
+
+There are also tests for the command-line interface that can be run as:
+
+mvn integration-test
+
+Maven runs thru both of the above phases when invoked as:
+
+mvn install
+
+The installed artifacts are:
+
+gridshib-common-<version>-javadoc.jar
+gridshib-common-<version>-sources.jar
+gridshib-common-<version>.jar
+
+gridshib-saml-tools-<version>-javadoc.jar
+gridshib-saml-tools-<version>-sources.jar
+gridshib-saml-tools-<version>.jar
+gridshib-saml-tools-<version>-config-cli-doc.tar.bz2
+gridshib-saml-tools-<version>-config-cli-doc.tar.gz
+
+
+The javadoc jars have the API documentation.
+
+The tar ball gridshib-saml-tools-<version>-config-cli-doc.tar.gz has
+the configuration files, command line tools and non-API documentation.

gridshib/gridshib-common/pom.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>org.jglobus</groupId>
+		<artifactId>gridshib</artifactId>
+		<version>2.1-SNAPSHOT</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>gridshib-common</artifactId>
+	<name>gridshib-common</name>
+
+<repositories>
+<repository>
+    <id>repo</id>
+    <url>file://${project.basedir}/repo</url>
+</repository>
+<repository>
+        <id>thirdparty-releases</id>
+        <name>JBoss Thirdparty Releases</name>
+        <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases</url>
+      </repository>
+</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>ssl-proxies</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>gss</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.globus.opensaml11</groupId>
+			<artifactId>saml</artifactId>
+		</dependency>
+<dependency>
+    <groupId>commons-cli</groupId>
+    <artifactId>commons-cli</artifactId>
+</dependency>
+<dependency>
+  <groupId>commons-dbcp</groupId>
+  <artifactId>commons-dbcp</artifactId>
+</dependency>
+<dependency>
+  <groupId>junit</groupId>
+  <artifactId>junit</artifactId>
+</dependency>
+<dependency>
+   <groupId>net.sf</groupId>
+        <artifactId>jargs</artifactId>
+</dependency>
+<dependency>
+  <groupId>xml-security</groupId>
+  <artifactId>xmlsec</artifactId>
+</dependency>
+<dependency>
+  <groupId>javax.servlet</groupId>
+  <artifactId>servlet-api</artifactId>
+</dependency>
+	</dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.globus.opensaml11:saml</include>
+                  <include>commons-cli:commons-cli</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>create-javadoc</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>javadoc</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>javadoc-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/1.1/saml-1.1.jar.md5

@@ -0,0 +1 @@
+7f6d1fe8827eb1bd82e05e82a75a2b04

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/1.1/saml-1.1.jar.sha1

@@ -0,0 +1 @@
+3f2bfd201d508f8110fb22993c1a575dd93f757b

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/1.1/saml-1.1.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.globus.opensaml11</groupId>
+  <artifactId>saml</artifactId>
+  <version>1.1</version>
+  <description>POM was created from install:install-file</description>
+</project>

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/1.1/saml-1.1.pom.md5

@@ -0,0 +1 @@
+d96f4f9f5fbdfab51a9802d6121f842e

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/1.1/saml-1.1.pom.sha1

@@ -0,0 +1 @@
+9e6df18a9cf73bf5641fbc0b13ab80d361d4a80b

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.globus.opensaml11</groupId>
+  <artifactId>saml</artifactId>
+  <versioning>
+    <release>1.1</release>
+    <versions>
+      <version>1.1</version>
+    </versions>
+    <lastUpdated>20130906164819</lastUpdated>
+  </versioning>
+</metadata>

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/maven-metadata-local.xml.md5

@@ -0,0 +1 @@
+92ffb052085ce4c7c1e2717bb289671e

gridshib/gridshib-common/repo/org/globus/opensaml11/saml/maven-metadata-local.xml.sha1

@@ -0,0 +1 @@
+c9621ae781caf8148d13f24f56b6ff3665f752af

gridshib/gridshib-common/src/main/java/org/globus/gridshib/common/BaseLogging.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008-2009 University of Illinois
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.globus.gridshib.common;
+
+/**
+ * Log configuration interface
+ *
+ * @since 0.3.0
+ */
+public interface BaseLogging {
+
+    public String getLogConfigPath();
+
+    public void configureLogger();
+
+    public void setDebugLogLevel();
+}
+

gridshib/gridshib-common/src/main/java/org/globus/gridshib/common/FileLocation.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright [2005] [University Corporation for Advanced Internet Development, Inc.]
+ * Copyright 2006-2009 University of Illinois
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.globus.gridshib.common;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * Manages access to location-based (i.e., file: URLs) resources
+ * in a consistent fashion.
+ *
+ * @see org.globus.opensaml11.md.common.ShibResource
+ */
+public class FileLocation {
+
+    private URL location = null;
+
+    public FileLocation(String name) throws ResourceNotAvailableException {
+
+        this(name, FileLocation.class);
+    }
+
+    public FileLocation(String name, Class requester)
+                 throws ResourceNotAvailableException {
+
+        if (name == null) {
+            String msg = "Null argument";
+            throw new IllegalArgumentException(msg);
+        }
+
+        try {
+            location = new URL(name);
+        } catch (MalformedURLException e) {
+            location = requester.getResource(name);
+        }
+
+        if (location == null) {
+            String msg = "Resource not found at specified location: ";
+            msg += name;
+            throw new ResourceNotAvailableException(msg);
+        }
+    }
+
+    /**
+     * Returns an input stream to read the file contents
+     */
+    public InputStream getInputStream() throws IOException {
+
+        return location.openStream();
+    }
+
+    /**
+     * Returns a <code>File</code> representation of the file
+     */
+    public File toFile() throws IOException {
+
+        try {
+            File file =
+                new File(new URI(location.toString().replaceAll("\\s", "%20")));
+            return file;
+        } catch (URISyntaxException e) {
+            String str = "Invalid URI: " + e.getMessage();
+            throw new ResourceNotAvailableException(str);
+        } catch (IllegalArgumentException e) {
+            String str = "Illegal argument: " + e.getMessage();
+            throw new ResourceNotAvailableException(str);
+        }
+    }
+
+    /**
+     * Returns a <code>URL</code> pointer to the file
+     */
+    public URL toURL() throws IOException {
+
+        return location;
+    }
+
+    public class ResourceNotAvailableException extends IOException {
+
+        public ResourceNotAvailableException(String message) {
+
+            super(message);
+        }
+    }
+}

gridshib/gridshib-common/src/main/java/org/globus/gridshib/common/GridShibConfigException.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-2009 University of Illinois
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.globus.gridshib.common;
+
+/**
+ * @since 0.4.0
+ */
+public class GridShibConfigException extends Exception {
+
+    public GridShibConfigException(String msg) {
+        super(msg);
+    }
+
+    public GridShibConfigException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}

gridshib/gridshib-common/src/main/java/org/globus/gridshib/common/GridShibException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2006-2009 University of Illinois
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.globus.gridshib.common;
+
+public class GridShibException extends Exception {
+
+    public GridShibException(String msg) {
+        super(msg);
+    }
+
+    public GridShibException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}