[java-identity-provider COMMIT] in /trunk: idp-distribution/src/main/resources/bin/build.xml idp-installer/src/main/j...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Oct 29 06:52:50 2014
New Revision: 6803

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6803&view=rev
Log:
IDP-481 Make metadata generator collect the input from the target.

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6803&r1=6802&r2=6803&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Wed Oct 29 06:52:50 2014
@@ -461,7 +461,7 @@
 		<echo append="true" file="idp_ant.log">target: metadata-gen
 		</echo>
 		<mkdir dir="${idp.target.dir}/metadata"/>
-		<metadatagenerate dnsName="${idp.host.name}" backChannelCert="${idp.target.dir}/credentials/idp-backchannel.crt" output="${idp.target.dir}/metadata/idp-metadata.xml"/>
+		<metadatagenerate dnsName="${idp.host.name}" idpHome="${idp.target.dir}" backChannelCert="${idp.target.dir}/credentials/idp-backchannel.crt" output="${idp.target.dir}/metadata/idp-metadata.xml"/>
 	</target>
 	
 	<!--

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java?rev=6803&r1=6802&r2=6803&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java Wed Oct 29 06:52:50 2014
@@ -22,6 +22,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.installer.metadata.MetadataGenerator;
 import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
@@ -42,25 +45,47 @@
 public class MetadataGeneratorTask extends Task {
 
     /** Where we collect the parameters. */
-    private final MetadataGeneratorParameters parameters;
 
     /** where to put the data. */
     private File outputFile;
-    
-    /**
-     * Constructor.
-     */
-    public MetadataGeneratorTask() {
-
-        final Resource resource = new ClassPathResource("net/shibboleth/idp/installer/metadata-generator.xml");
-
-        final ApplicationContextInitializer initializer = new IdPPropertiesApplicationContextInitializer();
-
-        final GenericApplicationContext context =
-                SpringSupport.newContext(MetadataGeneratorTask.class.getName(), Collections.singletonList(resource),
-                        Collections.<BeanPostProcessor> emptyList(), Collections.singletonList(initializer), null);
-
-        parameters = context.getBean("IdPConfiguration", MetadataGeneratorParameters.class);
+
+    /** Where idp.home is. */
+    @Nullable private String idpHome;
+
+    /** Ant level override for the encryption certificate. */
+    @Nullable private File encryptionCert;
+
+    /** Ant level override for the signing certificate. */
+    @Nullable private File signingCert;
+
+    /** Ant level override for the back channel certificate. */
+    @Nullable private File backchannelCert;
+
+    /** Ant level override for the entity ID. */
+    @Nullable private String entityID;
+
+    /** Ant level override for the DNS name. */
+    @Nullable private String dnsName;
+
+    /** Ant level override for the scope. */
+    @Nullable private String scope;
+
+    /**
+     * Where is idp.home.
+     * 
+     * @return Returns idpHome.
+     */
+    @Nullable public String getIdpHome() {
+        return idpHome;
+    }
+
+    /**
+     * Set where where is idp.home.
+     * 
+     * @param home The idpHome to set.
+     */
+    public void setIdpHome(@Nullable String home) {
+        idpHome = home;
     }
 
     /**
@@ -79,8 +104,7 @@
      * @param file what to set.
      */
     public void setEncryptionCert(File file) {
-
-        parameters.setEncryptionCert(file);
+        encryptionCert = file;
     }
 
     /**
@@ -89,8 +113,7 @@
      * @param file what to set.
      */
     public void setSigningCert(File file) {
-
-        parameters.setSigningCert(file);
+        signingCert = file;
     }
 
     /**
@@ -99,8 +122,7 @@
      * @param file what to set.
      */
     public void setBackchannelCert(File file) {
-
-        parameters.setBackchannelCert(file);
+        backchannelCert = file;
     }
 
     /**
@@ -109,7 +131,7 @@
      * @param id what to set.
      */
     public void setEntityID(String id) {

[... 103 lines stripped ...]