[java-identity-provider] branch master updated: IDP-1300 Move all the java-installer code into impl

Rod Widdowson rdw at steadingsoftware.com
Wed Jun 6 06:36:15 EDT 2018 

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3928ce315fcdfa5ff613cfd7d225144de45ae60d

The following commit(s) were added to refs/heads/master by this push:
       new  3928ce3   IDP-1300  Move all the java-installer code into impl
3928ce3 is described below

commit 3928ce315fcdfa5ff613cfd7d225144de45ae60d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jun 5 15:13:35 2018 +0100

    IDP-1300  Move all the java-installer code into impl
    
    https://issues.shibboleth.net/jira/browse/IDP-1300
    
    Leave the old code in place, marked @Deprecated
---
 .../java/net/shibboleth/idp/installer/PropertiesWithComments.java | 5 ++++-
 .../idp/installer/ant/BasicKeystoreKeyStrategyTask.java           | 5 ++++-
 .../net/shibboleth/idp/installer/ant/MergePropertiesTask.java     | 6 +++++-
 .../net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java   | 6 +++++-
 .../java/net/shibboleth/idp/installer/ant/PasswordHandler.java    | 2 +-
 .../idp/installer/ant/SelfSignedCertificateGeneratorTask.java     | 5 ++++-
 .../installer/ant/{ => impl}/BasicKeystoreKeyStrategyTask.java    | 2 +-
 .../idp/installer/ant/{ => impl}/MergePropertiesTask.java         | 4 ++--
 .../idp/installer/ant/{ => impl}/MetadataGeneratorTask.java       | 6 +++---
 .../shibboleth/idp/installer/ant/{ => impl}/PasswordHandler.java  | 2 +-
 .../ant/{ => impl}/SelfSignedCertificateGeneratorTask.java        | 2 +-
 .../net/shibboleth/idp/installer/ant/{ => impl}/package-info.java | 3 +--
 .../main/java/net/shibboleth/idp/installer/ant/package-info.java  | 3 ++-
 .../idp/installer/{ => impl}/PropertiesWithComments.java          | 2 +-
 .../net/shibboleth/idp/installer/{ => impl}/package-info.java     | 3 +--
 .../net/shibboleth/idp/installer/metadata/MetadataGenerator.java  | 5 ++++-
 .../idp/installer/metadata/MetadataGeneratorParameters.java       | 2 +-
 .../idp/installer/metadata/{ => impl}/MetadataGenerator.java      | 2 +-
 .../metadata/{ => impl}/MetadataGeneratorParameters.java          | 2 +-
 .../idp/installer/metadata/{ => impl}/package-info.java           | 3 +--
 .../java/net/shibboleth/idp/installer/metadata/package-info.java  | 3 ++-
 .../src/main/java/net/shibboleth/idp/installer/package-info.java  | 3 ++-
 .../src/main/resources/net/shibboleth/idp/installer/ant.xml       | 8 ++++----
 .../resources/net/shibboleth/idp/installer/metadata-generator.xml | 2 +-
 .../java/net/shibboleth/idp/installer/TestMetadataGenerator.java  | 2 +-
 .../net/shibboleth/idp/installer/TestPropertiesWithComments.java  | 2 ++
 26 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
index 86169c5..2e84c6c 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
@@ -34,13 +34,15 @@ import java.util.Properties;
 import javax.annotation.Nonnull;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 /**
  * A package which is similar to Properties, but allows comments to be preserved. We use the Properties package to parse
  * the non-comment lines.
  */
-public class PropertiesWithComments {
+ at Deprecated public class PropertiesWithComments {
 
     /**
      * The contents.
@@ -101,6 +103,7 @@ public class PropertiesWithComments {
      * @throws IOException if readline fails
      */
     public void load(final InputStream input) throws IOException {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
         final BufferedReader reader = new BufferedReader(new InputStreamReader(input));
         contents = new ArrayList<>();
         properties = new HashMap<>();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java
index d12311c..8977ca1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java
@@ -24,6 +24,8 @@ import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool;
 
 import org.apache.tools.ant.BuildException;
@@ -33,7 +35,7 @@ import org.apache.tools.ant.Task;
 /**
  * Wrapper around {@link BasicKeystoreKeyStrategyTool}.
  */
-public class BasicKeystoreKeyStrategyTask extends Task {
+ at Deprecated public class BasicKeystoreKeyStrategyTask extends Task {
 
     /** encapsulated {@link BasicKeystoreKeyStrategyTool}.*/
     private BasicKeystoreKeyStrategyTool tool;
@@ -118,6 +120,7 @@ public class BasicKeystoreKeyStrategyTask extends Task {
     /** {@inheritDoc} */
     @Override
     public void execute() {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
         try {
             tool.changeKey();
         } catch (final Exception e) {
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java
index 9bb73fb..5b2d996 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java
@@ -27,6 +27,8 @@ import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.installer.PropertiesWithComments;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -35,7 +37,7 @@ import org.apache.tools.ant.Task;
 /**
  * A class to merge a property file into another property file, preserving the comments. 
  */
-public class MergePropertiesTask extends Task {
+ at Deprecated public class MergePropertiesTask extends Task {
 
     /** The input file. */
     private File inFile;
@@ -71,6 +73,8 @@ public class MergePropertiesTask extends Task {
     // Checkstyle: CyclomaticComplexity OFF
     @Override
     public void execute() {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
+
         if (null == inFile) {
             log("Input file not provided", Project.MSG_ERR);
             throw new BuildException("Non-existent input file");
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
index 5c489f0..fbcab8a 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
@@ -37,11 +37,13 @@ import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.idp.installer.metadata.MetadataGenerator;
 import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 /**
  * Task to generate metadata.
  */
-public class MetadataGeneratorTask extends Task {
+ at Deprecated public class MetadataGeneratorTask extends Task {
 
     /** Where we collect the parameters. */
 
@@ -200,6 +202,8 @@ public class MetadataGeneratorTask extends Task {
     /** {@inheritDoc} */
     // Checkstyle: CyclomaticComplexity OFF
     @Override public void execute() {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
+
         try {
             final MetadataGeneratorParameters parameters;
 
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java
index 45b3ca2..cc721bb 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java
@@ -21,7 +21,7 @@ import org.apache.tools.ant.input.InputRequest;
 import org.apache.tools.ant.input.SecureInputHandler;
 
 /** Ant helper class to ask for passwords, rejecting zero length passwords and asking for confirmation. */
-public class PasswordHandler extends SecureInputHandler {
+ at Deprecated public class PasswordHandler extends SecureInputHandler {
 
     /** {@inheritDoc} */
     @Override
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java
index 3e26e5b..0e287c7 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java
@@ -26,7 +26,9 @@ import javax.annotation.Nullable;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator;
 
 import org.apache.tools.ant.BuildException;
@@ -36,7 +38,7 @@ import org.apache.tools.ant.Task;
 /**
  * Task to shim around {@link SelfSignedCertificateGenerator}.
  */
-public class SelfSignedCertificateGeneratorTask extends Task {
+ at Deprecated public class SelfSignedCertificateGeneratorTask extends Task {
 
     /** Our wrapped {@link SelfSignedCertificateGenerator}. */
     private SelfSignedCertificateGenerator generator;
@@ -161,6 +163,7 @@ public class SelfSignedCertificateGeneratorTask extends Task {
     @Override 
     /** {@inheritDoc} */
     public void execute() {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
         try {
             generator.generate();
         } catch (final Exception e) {
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/BasicKeystoreKeyStrategyTask.java
similarity index 98%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/BasicKeystoreKeyStrategyTask.java
index d12311c..6b0963f 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/BasicKeystoreKeyStrategyTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.ant;
+package net.shibboleth.idp.installer.ant.impl;
 
 import java.io.File;
 
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MergePropertiesTask.java
similarity index 97%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MergePropertiesTask.java
index 9bb73fb..fe7761c 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MergePropertiesTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MergePropertiesTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.ant;
+package net.shibboleth.idp.installer.ant.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,7 +25,7 @@ import java.util.Properties;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.installer.PropertiesWithComments;
+import net.shibboleth.idp.installer.impl.PropertiesWithComments;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.apache.tools.ant.BuildException;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
similarity index 97%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
index 5c489f0..2e92ca7 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/MetadataGeneratorTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.ant;
+package net.shibboleth.idp.installer.ant.impl;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -34,8 +34,8 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
 import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
-import net.shibboleth.idp.installer.metadata.MetadataGenerator;
-import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
+import net.shibboleth.idp.installer.metadata.impl.MetadataGenerator;
+import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorParameters;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 
 /**
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
similarity index 97%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
index 45b3ca2..6ff291f 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/PasswordHandler.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/PasswordHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.ant;
+package net.shibboleth.idp.installer.ant.impl;
 
 import org.apache.tools.ant.input.InputRequest;
 import org.apache.tools.ant.input.SecureInputHandler;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/SelfSignedCertificateGeneratorTask.java
similarity index 99%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/SelfSignedCertificateGeneratorTask.java
index 3e26e5b..73d85e9 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/SelfSignedCertificateGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/SelfSignedCertificateGeneratorTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.ant;
+package net.shibboleth.idp.installer.ant.impl;
 
 import java.io.File;
 import java.util.List;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/package-info.java
similarity index 94%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/package-info.java
index a6dd82d..93116d3 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/package-info.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * Targets for Ant.
  */
 
-package net.shibboleth.idp.installer.ant;
\ No newline at end of file
+package net.shibboleth.idp.installer.ant.impl;
\ No newline at end of file
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java
index a6dd82d..d40bdd6 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/package-info.java
@@ -16,7 +16,8 @@
  */
 
 /**
- * Targets for Ant.
+ * OLD, DEPRECATED Targets for Ant.
+ * Use the .impl versions
  */
 
 package net.shibboleth.idp.installer.ant;
\ No newline at end of file
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/PropertiesWithComments.java
similarity index 99%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/impl/PropertiesWithComments.java
index 86169c5..6537c18 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/PropertiesWithComments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/PropertiesWithComments.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer;
+package net.shibboleth.idp.installer.impl;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/package-info.java
similarity index 95%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/impl/package-info.java
index 5491c4c..7f5bd0b 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/package-info.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * Classes of use during installation.
  */
-package net.shibboleth.idp.installer;
 
+package net.shibboleth.idp.installer.impl;
\ No newline at end of file
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
index 5670dbd..e49bfdd 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
@@ -57,6 +57,8 @@ import net.shibboleth.idp.saml.xmlobject.ExtensionsConstants;
 import net.shibboleth.idp.saml.xmlobject.Scope;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
@@ -65,7 +67,7 @@ import net.shibboleth.utilities.java.support.xml.XMLConstants;
  * generator, and the V2 metadata.
  */
 // Checkstyle: HideUtilityClassConstructor OFF
-public class MetadataGenerator {
+ at Deprecated public class MetadataGenerator {
 
     /**
      * The end points we understand.
@@ -165,6 +167,7 @@ public class MetadataGenerator {
      * @throws FileNotFoundException if the file cannot be found.
      */
     public MetadataGenerator(@Nonnull final File file) throws FileNotFoundException {
+        DeprecationSupport.warn(ObjectType.CLASS, this.getClass().getName(), null , ".impl");
         final File nonnullFile = Constraint.isNotNull(file, "provided file must be nonnull");
         final FileOutputStream outStream = new FileOutputStream(nonnullFile);
         writer = new BufferedWriter(new OutputStreamWriter(outStream));
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
index b9ea502..999a034 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
 /**
  * POJO to collect parameters from the metadata configuration (partially via spring).
  */
-public class MetadataGeneratorParameters {
+ at Deprecated public class MetadataGeneratorParameters {
 
     /**
      * The file with the certificate the IDP uses to encrypt.
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
similarity index 99%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
index 5670dbd..6c83119 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGenerator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.metadata;
+package net.shibboleth.idp.installer.metadata.impl;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
similarity index 99%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
index b9ea502..3f4047b 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGeneratorParameters.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorParameters.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.metadata;
+package net.shibboleth.idp.installer.metadata.impl;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/package-info.java
similarity index 94%
copy from idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java
copy to idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/package-info.java
index 78ee67d..a683a37 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/package-info.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * Package to contain classes to do with the one off metadata generation.
  */
 
-package net.shibboleth.idp.installer.metadata;
\ No newline at end of file
+package net.shibboleth.idp.installer.metadata.impl;
\ No newline at end of file
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java
index 78ee67d..adbed4e 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/package-info.java
@@ -16,7 +16,8 @@
  */
 
 /**
- * Package to contain classes to do with the one off metadata generation.
+ * OLD, DEPRECATED Package to contain classes to do with the one off metadata generation.
+ * Use the .impl versions
  */
 
 package net.shibboleth.idp.installer.metadata;
\ No newline at end of file
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java
index 5491c4c..5173817 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/package-info.java
@@ -16,7 +16,8 @@
  */
 
 /**
- * Classes of use during installation.
+ * OLD Deprecated. Classes of use during installation.
+ * Use the .impl versions
  */
 package net.shibboleth.idp.installer;
 
diff --git a/idp-installer/src/main/resources/net/shibboleth/idp/installer/ant.xml b/idp-installer/src/main/resources/net/shibboleth/idp/installer/ant.xml
index 314aa4e..42d3cd0 100644
--- a/idp-installer/src/main/resources/net/shibboleth/idp/installer/ant.xml
+++ b/idp-installer/src/main/resources/net/shibboleth/idp/installer/ant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <antlib>
-    <taskdef name="selfsignedcert" classname="net.shibboleth.idp.installer.ant.SelfSignedCertificateGeneratorTask"/>
-    <taskdef name="keystorestrategy" classname="net.shibboleth.idp.installer.ant.BasicKeystoreKeyStrategyTask"/>
-    <taskdef name="mergeproperties" classname="net.shibboleth.idp.installer.ant.MergePropertiesTask"/>
-    <taskdef name="metadatagenerate" classname="net.shibboleth.idp.installer.ant.MetadataGeneratorTask"/>
+    <taskdef name="selfsignedcert" classname="net.shibboleth.idp.installer.ant.impl.SelfSignedCertificateGeneratorTask"/>
+    <taskdef name="keystorestrategy" classname="net.shibboleth.idp.installer.ant.impl.BasicKeystoreKeyStrategyTask"/>
+    <taskdef name="mergeproperties" classname="net.shibboleth.idp.installer.ant.impl.MergePropertiesTask"/>
+    <taskdef name="metadatagenerate" classname="net.shibboleth.idp.installer.ant.impl.MetadataGeneratorTask"/>
 </antlib>
\ No newline at end of file
diff --git a/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml b/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
index 047fa4a..f9d393c 100644
--- a/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
+++ b/idp-installer/src/main/resources/net/shibboleth/idp/installer/metadata-generator.xml
@@ -13,7 +13,7 @@
     <context:property-placeholder />
 
 	<bean id="IdPConfiguration"
-		class="net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters"
+		class="net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorParameters"
 		p:encryptionCertResource="%{idp.encryption.cert}" p:signingCertResource="%{idp.signing.cert}"
 		p:entityID="%{idp.entityID}" p:scope="%{idp.scope}" />
 </beans>
\ No newline at end of file
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java
index 8f12435..7a84a60 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestMetadataGenerator.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import net.shibboleth.idp.installer.ant.MetadataGeneratorTask;
+import net.shibboleth.idp.installer.ant.impl.MetadataGeneratorTask;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 import org.joda.time.DateTime;
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
index 8a7f33f..c384365 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestPropertiesWithComments.java
@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import net.shibboleth.idp.installer.impl.PropertiesWithComments;
+
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list