diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup index 4036946..72f57c3 100644 --- a/pom.xml.releaseBackup +++ b/pom.xml.releaseBackup @@ -2,7 +2,7 @@ 4.0.0 FactionSecurity faction-extender - 2.0-SNAPSHOT + 2.1-SNAPSHOT jar Faction Extender API API to reference when building extensions for Faction. diff --git a/release.properties b/release.properties index a8e66b0..130515b 100644 --- a/release.properties +++ b/release.properties @@ -1,11 +1,11 @@ #release configuration -#Thu Dec 21 01:15:15 CST 2023 +#Thu Dec 21 01:35:11 CST 2023 completedPhase=end-release exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true -P github exec.snapshotReleasePluginAllowed=false preparationGoals=clean verify -project.dev.FactionSecurity\:faction-extender=2.1-SNAPSHOT -project.rel.FactionSecurity\:faction-extender=2.0 +project.dev.FactionSecurity\:faction-extender=2.2-SNAPSHOT +project.rel.FactionSecurity\:faction-extender=2.1 project.scm.FactionSecurity\:faction-extender.connection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git project.scm.FactionSecurity\:faction-extender.developerConnection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git project.scm.FactionSecurity\:faction-extender.id=github @@ -16,7 +16,7 @@ pushChanges=true remoteTagging=true scm.commentPrefix=[maven-release-plugin] scm.id=github -scm.tag=2.0 +scm.tag=2.1 scm.tagNameFormat=@{project.version} scm.url=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git scm.username=summitt diff --git a/src/com/faction/extender/AssessmentManagerResult.java b/src/com/faction/elements/results/AssessmentManagerResult.java similarity index 93% rename from src/com/faction/extender/AssessmentManagerResult.java rename to src/com/faction/elements/results/AssessmentManagerResult.java index c16ee0e..f0f4691 100644 --- a/src/com/faction/extender/AssessmentManagerResult.java +++ b/src/com/faction/elements/results/AssessmentManagerResult.java @@ -1,8 +1,10 @@ -package com.faction.extender; +package com.faction.elements.results; -import com.faction.elements.Vulnerability; -import com.faction.elements.Assessment; import java.util.List; + +import com.faction.elements.Assessment; +import com.faction.elements.Vulnerability; + import java.util.ArrayList; public class AssessmentManagerResult { diff --git a/src/com/faction/extender/InventoryResult.java b/src/com/faction/elements/results/InventoryResult.java similarity index 93% rename from src/com/faction/extender/InventoryResult.java rename to src/com/faction/elements/results/InventoryResult.java index 64b4664..5b9dc35 100644 --- a/src/com/faction/extender/InventoryResult.java +++ b/src/com/faction/elements/results/InventoryResult.java @@ -1,4 +1,4 @@ -package com.faction.extender; +package com.faction.elements.results; import java.util.HashMap; diff --git a/src/com/faction/elements/utils/Logger.java b/src/com/faction/elements/utils/Logger.java new file mode 100644 index 0000000..0c9e296 --- /dev/null +++ b/src/com/faction/elements/utils/Logger.java @@ -0,0 +1,45 @@ +package com.faction.elements.utils; + +import java.io.PrintWriter; +import java.io.StringWriter; + +public class Logger { + + public enum LEVEL { INFO, WARNING, ERROR, DEBUG }; + private LEVEL level; + private String message; + private String stackTrace; + + public Logger(LEVEL level, Exception exception) { + this.level = level; + this.message = exception.getMessage(); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + exception.printStackTrace(pw); + this.stackTrace = sw.toString(); + + } + public LEVEL getLevel() { + return level; + } + public void setLevel(LEVEL level) { + this.level = level; + } + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + public String getStackTrace() { + return this.stackTrace; + } + + + + + + + + +} diff --git a/src/com/faction/extender/ApplicationInventory.java b/src/com/faction/extender/ApplicationInventory.java index 7bcc928..b5885e1 100644 --- a/src/com/faction/extender/ApplicationInventory.java +++ b/src/com/faction/extender/ApplicationInventory.java @@ -1,6 +1,6 @@ package com.faction.extender; - +import com.faction.elements.results.InventoryResult; public interface ApplicationInventory { diff --git a/src/com/faction/extender/AssessmentManager.java b/src/com/faction/extender/AssessmentManager.java index 4a3be66..232a859 100644 --- a/src/com/faction/extender/AssessmentManager.java +++ b/src/com/faction/extender/AssessmentManager.java @@ -4,7 +4,7 @@ import com.faction.elements.Assessment; import com.faction.elements.Vulnerability; -import com.faction.extender.AssessmentManagerResult; +import com.faction.elements.results.AssessmentManagerResult; public interface AssessmentManager { diff --git a/src/com/faction/extender/ExtensionMetaData.java b/src/com/faction/extender/ExtensionMetaData.java new file mode 100644 index 0000000..25d4995 --- /dev/null +++ b/src/com/faction/extender/ExtensionMetaData.java @@ -0,0 +1,10 @@ +package com.faction.extender; + +public interface ExtensionMetaData { + + public String getCreatedBy(); + public String getVersion(); + public String getDescription(); + + +}