[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/resources/creds/idp-backchannel.crt idp-installer/pom.xm...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Sep 27 07:44:40 2014
New Revision: 6598

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6598&view=rev
Log:
Jiggery pokery to get the build to work.

Added:
    trunk/idp-installer/src/test/resources/creds/
    trunk/idp-installer/src/test/resources/creds/idp-backchannel.crt
      - copied unchanged from r6597, trunk/idp-conf/src/test/resources/creds/idp-backchannel.crt
    trunk/idp-installer/src/test/resources/creds/idp-encryption.crt
      - copied unchanged from r6597, trunk/idp-conf/src/test/resources/creds/idp-encryption.crt
    trunk/idp-installer/src/test/resources/creds/idp-signing.crt
      - copied unchanged from r6597, trunk/idp-conf/src/test/resources/creds/idp-signing.crt
Modified:
    trunk/idp-conf/src/test/resources/creds/idp-backchannel.crt
    trunk/idp-installer/pom.xml
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java

Modified: trunk/idp-installer/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/pom.xml?rev=6598&r1=6597&r2=6598&view=diff
==============================================================================
--- trunk/idp-installer/pom.xml (original)
+++ trunk/idp-installer/pom.xml Sat Sep 27 07:44:40 2014
@@ -24,6 +24,12 @@
             <version>${project.version}</version>
         </dependency>
         
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
@@ -86,4 +92,4 @@
         <!-- Managed Dependencies -->
     </dependencies>
     
-</project>
+</project>

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java?rev=6598&r1=6597&r2=6598&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java Sat Sep 27 07:44:40 2014
@@ -37,7 +37,7 @@
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml2.common.Extensions;
+import org.opensaml.saml.saml2.core.Extensions;
 import org.opensaml.saml.saml2.core.NameIDType;
 import org.opensaml.saml.saml2.metadata.ArtifactResolutionService;
 import org.opensaml.saml.saml2.metadata.AttributeAuthorityDescriptor;
@@ -429,7 +429,7 @@
         if (null == getScope() || getScope().isEmpty()) {
             return;
         }
-        writer.write("        <");writer.write(Extensions.LOCAL_NAME);writer.write('>');
+        writer.write("        <");writer.write(Extensions.DEFAULT_ELEMENT_LOCAL_NAME);writer.write('>');
         writer.newLine();
 
         writer.write("            <");
@@ -445,7 +445,7 @@
         writer.write('>');
         writer.newLine();
 
-        writer.write("        </");writer.write(Extensions.LOCAL_NAME);writer.write('>');
+        writer.write("        </");writer.write(Extensions.DEFAULT_ELEMENT_LOCAL_NAME);writer.write('>');
         writer.newLine();
     }
 

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java?rev=6598&r1=6597&r2=6598&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java Sat Sep 27 07:44:40 2014
@@ -157,7 +157,7 @@
         if (null == file || !file.exists()) {
             return null;
         }
-        final FileReader fr = new FileReader(encryptionCert);
+        final FileReader fr = new FileReader(file);
         final BufferedReader reader = new BufferedReader(fr);
 
         try {