Use more generic names for packages, artifacts, etc.

Author: iay

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>inc-validator</name>
+	<name>md-validator</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -32,7 +32,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

Dockerfile

@@ -1,5 +1,5 @@
 #
-# Dockerfile for inc-validator.
+# Dockerfile for md-validator.
 #
 # Performed as a two-stage build so that we can use Maven to generate the application
 # but not have it (and the things it downloads) clutter up the deployed image.
@@ -30,4 +30,4 @@ WORKDIR /user
 COPY --from=build-jar /user/target/*.jar .
 
 EXPOSE 8080
-CMD ["java", "-jar", "inc-validator-0.0.1-SNAPSHOT.jar"]
+CMD ["java", "-jar", "md-validator-0.0.1-SNAPSHOT.jar"]

docker-build

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t iay/inc-validator .
+docker build -t iay/md-validator .

docker-run

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --restart=always -p 8080:8080 --name inc-validator \
-    iay/inc-validator
+docker run -d --restart=always -p 8080:8080 --name md-validator \
+    iay/md-validator

docker-terminate

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker rm --force inc-validator
+docker rm --force md-validator

docker-test

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --rm -it -p 8080:8080 --name inc-validator-test iay/inc-validator
+docker run --rm -it -p 8080:8080 --name md-validator-test iay/md-validator

pom.xml

@@ -9,8 +9,8 @@
         <version>1.5.14.RELEASE</version>
     </parent>
 
-    <groupId>uk.org.iay.incommon.validator</groupId>
-    <artifactId>inc-validator</artifactId>
+    <groupId>uk.org.iay.md.validator</groupId>
+    <artifactId>md-validator</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <packaging>jar</packaging>
@@ -207,9 +207,9 @@
                             <inputSpec>${spec.location}</inputSpec>
                             <language>spring</language>
 
-                            <invokerPackage>uk.org.iay.incommon.validator</invokerPackage>
-                            <modelPackage>uk.org.iay.incommon.validator.models</modelPackage>
-                            <apiPackage>uk.org.iay.incommon.validator.api</apiPackage>
+                            <invokerPackage>uk.org.iay.md.validator</invokerPackage>
+                            <modelPackage>uk.org.iay.md.validator.models</modelPackage>
+                            <apiPackage>uk.org.iay.md.validator.api</apiPackage>
                             <interfaceOnly>false</interfaceOnly>
                             <useOptional>true</useOptional>
                             <delegatePattern>true</delegatePattern>

src/main/java/uk/org/iay/incommon/validator/ValidatorConfiguration.java src/main/java/uk/org/iay/md/validator/ValidatorConfiguration.java

@@ -13,7 +13,7 @@
  */
 
 
-package uk.org.iay.incommon.validator;
+package uk.org.iay.md.validator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,7 +24,7 @@
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import uk.org.iay.incommon.validator.context.ValidatorCollection;
+import uk.org.iay.md.validator.context.ValidatorCollection;
 
 /**
  * Validator configuration.

src/main/java/uk/org/iay/incommon/validator/api/ApiException.java src/main/java/uk/org/iay/md/validator/api/ApiException.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package uk.org.iay.incommon.validator.api;
+package uk.org.iay.md.validator.api;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/uk/org/iay/incommon/validator/api/NotFoundException.java src/main/java/uk/org/iay/md/validator/api/NotFoundException.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package uk.org.iay.incommon.validator.api;
+package uk.org.iay.md.validator.api;
 
 import org.springframework.http.HttpStatus;
 

src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApi.java src/main/java/uk/org/iay/md/validator/api/ValidatorsApi.java

@@ -6,7 +6,7 @@
  * **IAY**: The only changes here from the generated file have been to clean up the imports
  * list and to add "throws ApiException" to the validate method.
  */
-package uk.org.iay.incommon.validator.api;
+package uk.org.iay.md.validator.api;
 
 import java.util.List;
 
@@ -23,8 +23,8 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import uk.org.iay.incommon.validator.models.Status;
-import uk.org.iay.incommon.validator.models.Validator;
+import uk.org.iay.md.validator.models.Status;
+import uk.org.iay.md.validator.models.Validator;
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2018-05-12T13:33:10.546+01:00")
 
 @Api(value = "validators", description = "the validators API")

src/main/java/uk/org/iay/incommon/validator/api/ValidatorsApiController.java src/main/java/uk/org/iay/md/validator/api/ValidatorsApiController.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package uk.org.iay.incommon.validator.api;
+package uk.org.iay.md.validator.api;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -47,10 +47,10 @@
 import net.shibboleth.metadata.pipeline.PipelineProcessingException;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import uk.org.iay.incommon.validator.context.ValidatorCollection;
-import uk.org.iay.incommon.validator.models.Status;
-import uk.org.iay.incommon.validator.models.Status.StatusEnum;
-import uk.org.iay.incommon.validator.models.Validator;
+import uk.org.iay.md.validator.models.Status;
+import uk.org.iay.md.validator.models.Status.StatusEnum;
+import uk.org.iay.md.validator.context.ValidatorCollection;
+import uk.org.iay.md.validator.models.Validator;
 
 /**
  * Controller for the Validators API.

src/main/java/uk/org/iay/incommon/validator/api/package-info.java src/main/java/uk/org/iay/md/validator/api/package-info.java

@@ -15,4 +15,4 @@
 /**
  * API classes for the metadata validator service.
  */
-package uk.org.iay.incommon.validator.api;
+package uk.org.iay.md.validator.api;

src/main/java/uk/org/iay/incommon/validator/context/ValidatorCollection.java src/main/java/uk/org/iay/md/validator/context/ValidatorCollection.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package uk.org.iay.incommon.validator.context;
+package uk.org.iay.md.validator.context;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/uk/org/iay/incommon/validator/context/package-info.java src/main/java/uk/org/iay/md/validator/context/package-info.java

@@ -15,4 +15,4 @@
 /**
  * Context creation and manipulation for the metadata validator service.
  */
-package uk.org.iay.incommon.validator.context;
+package uk.org.iay.md.validator.context;

src/main/java/uk/org/iay/incommon/validator/package-info.java src/main/java/uk/org/iay/md/validator/package-info.java

@@ -15,4 +15,4 @@
 /**
  * Metadata validator service.
  */
-package uk.org.iay.incommon.validator;
+package uk.org.iay.md.validator;

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 springfox.documentation.swagger.v2.path=/api-docs
 server.contextPath=
 server.port=8080
-spring.jackson.date-format=uk.org.iay.incommon.validator.RFC3339DateFormat
+spring.jackson.date-format=uk.org.iay.md.validator.RFC3339DateFormat
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
 
 # Common configuration shared across all validators.