[java-identity-provider COMMIT] /trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGenerator...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jun 16 09:18:28 2016
New Revision: 8269

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8269&view=rev
Log:
IDP-991 make sure we never care about idp-home in the installer

https://issues.shibboleth.net/jira/browse/IDP-991

Override the method which does the lookup of idp.home in the environment.
In the installer don't care and should just look at what we are given.

Also eclipse inspried formatting.

Modified:
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java

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=8269&r1=8268&r2=8269&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	Thu Jun 16 09:18:28 2016
@@ -36,6 +36,7 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -95,7 +96,7 @@
      * 
      * @param home The idpHome to set.
      */
-    public void setIdpHome(@Nullable String home) {
+    public void setIdpHome(@Nullable final String home) {
         idpHome = home;
     }
 
@@ -104,7 +105,7 @@
      * 
      * @param file what to set.
      */
-    public void setOutput(File file) {
+    public void setOutput(final File file) {
 
         outputFile = file;
     }
@@ -114,7 +115,7 @@
      * 
      * @param file what to set.
      */
-    public void setEncryptionCert(File file) {
+    public void setEncryptionCert(final File file) {
         encryptionCert = file;
     }
 
@@ -123,7 +124,7 @@
      * 
      * @param file what to set.
      */
-    public void setSigningCert(File file) {
+    public void setSigningCert(final File file) {
         signingCert = file;
     }
 
@@ -132,7 +133,7 @@
      * 
      * @param file what to set.
      */
-    public void setBackchannelCert(File file) {
+    public void setBackchannelCert(final File file) {
         backchannelCert = file;
     }
 
@@ -141,7 +142,7 @@
      * 
      * @param id what to set.
      */
-    public void setEntityID(String id) {
+    public void setEntityID(final String id) {
         entityID = id;
     }
 
@@ -150,7 +151,7 @@
      * 
      * @param name what to set.
      */
-    public void setDnsName(String name) {
+    public void setDnsName(final String name) {
         dnsName = name;
     }
 
@@ -159,38 +160,46 @@
      * 
      * @param value what to set.
      */
-    public void setScope(String value) {
+    public void setScope(final String value) {
         scope = value;
     }
 
-    /** Returns whether to comment the SAML2 AA endpoint.
+    /**
+     * Returns whether to comment the SAML2 AA endpoint.
+     * 
      * @return Returns when to comment the SAML2 AA endpoint.
      */
     public boolean isSAML2AttributeQueryCommented() {
         return saml2AttributeQueryCommented;
     }
 
-    /** Sets whether to comment the SAML2 AA endpoint.
+    /**
+     * Sets whether to comment the SAML2 AA endpoint.
+     * 
      * @param asComment whether to comment or not.
      */
-    public void setSAML2AttributeQueryCommented(boolean asComment) {
+    public void setSAML2AttributeQueryCommented(final boolean asComment) {
         saml2AttributeQueryCommented = asComment;
     }
 
-    /** Returns whether to comment the SAML2 Logout endpoints.
-     * @return  whether to comment the SAML2 Logout endpoints
+    /**
+     * Returns whether to comment the SAML2 Logout endpoints.
+     * 
+     * @return whether to comment the SAML2 Logout endpoints
      */
     public boolean isSAML2LogoutCommented() {
         return saml2LogoutCommented;
     }
 
-    /** Sets whether to comment the SAML2 Logout endpoints.
+    /**
+     * Sets whether to comment the SAML2 Logout endpoints.
+     * 
      * @param asComment whether to comment or not
      */
-    public void setSAML2LogoutCommented(boolean asComment) {
+    public void setSAML2LogoutCommented(final boolean asComment) {
         saml2LogoutCommented = asComment;
     }
-    
+
     /** {@inheritDoc} */
     // Checkstyle: CyclomaticComplexity OFF
     @Override public void execute() {
@@ -203,8 +212,8 @@
 
             final GenericApplicationContext context =
                     SpringSupport.newContext(MetadataGeneratorTask.class.getName(),

[... 67 lines stripped ...]