and some more refactorings prozessing archives overhowled

cecom · Jan 2, 2017 · 120df88 · 120df88
1 parent e88d6d3
commit 120df88
Show file tree

Hide file tree

Showing 39 changed files with 241 additions and 358 deletions.
diff --git a/api/src/main/java/com/geewhiz/pacify/defect/ArchiveDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/ArchiveDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PArchive;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/ArchiveDuplicateDefinedInPMarkerDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/ArchiveDuplicateDefinedInPMarkerDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PArchive;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/ArchiveTypeNotImplementedDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/ArchiveTypeNotImplementedDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PArchive;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/DefectException.java b/api/src/main/java/com/geewhiz/pacify/defect/DefectException.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.Defect;
 import com.geewhiz.pacify.model.PArchive;
 import com.geewhiz.pacify.model.PFile;
 import com.geewhiz.pacify.model.PMarker;
@@ -88,7 +89,7 @@ public String getDefectMessage() {
             }
         } else {
             if (pFile != null) {
-                result.append(String.format("\n\t[File=%s]", pFile.getFile().getAbsolutePath()));
+                result.append(String.format("\n\t[File=%s]", pFile.getRelativePath()));
             }
         }
 

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/DefectMessage.java b/api/src/main/java/com/geewhiz/pacify/defect/DefectMessage.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/FileDoesNotExistDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/FileDoesNotExistDefect.java
@@ -1,5 +1,7 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/FileDuplicateDefinedInPMarkerDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/FileDuplicateDefinedInPMarkerDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/FilterNotFoundDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/FilterNotFoundDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/NoPlaceholderInTargetFileDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/NoPlaceholderInTargetFileDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PProperty;
 
 public class NoPlaceholderInTargetFileDefect extends DefectException {

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/NotReplacedPropertyDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/NotReplacedPropertyDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 public class NotReplacedPropertyDefect extends DefectException {

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/PlaceholderNotDefinedDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/PlaceholderNotDefinedDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 public class PlaceholderNotDefinedDefect extends DefectException {

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/PropertyDuplicateDefinedInPMarkerDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/PropertyDuplicateDefinedInPMarkerDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PProperty;
 
 /*

diff --git a/...src/main/java/com/geewhiz/pacify/defect/PropertyDuplicateDefinedInPropertyFileDefect.java b/...src/main/java/com/geewhiz/pacify/defect/PropertyDuplicateDefinedInPropertyFileDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/PropertyHasCycleDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/PropertyHasCycleDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PMarker;
 import com.geewhiz.pacify.model.PProperty;
 

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/PropertyNotDefinedInResolverDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/PropertyNotDefinedInResolverDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PProperty;
 
 public class PropertyNotDefinedInResolverDefect extends DefectException {

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/ResolverDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/ResolverDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PProperty;
 
 public class ResolverDefect extends DefectException {

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/WrongTokenDefinedDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/WrongTokenDefinedDefect.java
@@ -1,5 +1,6 @@
 package com.geewhiz.pacify.defect;
 
+import com.geewhiz.pacify.defect.DefectException;
 import com.geewhiz.pacify.model.PFile;
 
 /*

diff --git a/api/src/main/java/com/geewhiz/pacify/defect/XMLValidationDefect.java b/api/src/main/java/com/geewhiz/pacify/defect/XMLValidationDefect.java
@@ -2,6 +2,8 @@
 
 import java.io.File;
 
+import com.geewhiz.pacify.defect.DefectException;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file

diff --git a/commandline/src/main/java/com/geewhiz/pacify/commandline/PacifyViaCommandline.java b/commandline/src/main/java/com/geewhiz/pacify/commandline/PacifyViaCommandline.java
@@ -21,7 +21,7 @@
 import com.geewhiz.pacify.commandline.commands.ValidateCommand;
 import com.geewhiz.pacify.commandline.commands.ValidateMarkerFilesCommand;
 import com.geewhiz.pacify.defect.Defect;
-import com.geewhiz.pacify.exceptions.DefectRuntimeException;
+import com.geewhiz.pacify.defect.DefectRuntimeException;
 import com.geewhiz.pacify.resolver.PropertyResolverModule;
 import com.geewhiz.pacify.utils.DefectUtils;
 import com.geewhiz.pacify.utils.LoggingUtils;

diff --git a/common/pom.xml b/common/pom.xml
@@ -37,18 +37,16 @@
             <artifactId>pacify.api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
+
     </dependencies>
 </project>
 
diff --git a/common/src/main/java/com/geewhiz/pacify/utils/DefectUtils.java b/common/src/main/java/com/geewhiz/pacify/utils/DefectUtils.java
@@ -6,7 +6,7 @@
 import org.apache.logging.log4j.Logger;
 
 import com.geewhiz.pacify.defect.Defect;
-import com.geewhiz.pacify.exceptions.DefectRuntimeException;
+import com.geewhiz.pacify.defect.DefectRuntimeException;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one