Merge pull request #447 from assimbly/develop

tested & approved
assimbly · Feb 3, 2021 · e72e298 · e72e298
2 parents ac2cfeb + b6a20bd
commit e72e298
Show file tree

Hide file tree

Showing 34 changed files with 18,061 additions and 1,571 deletions.
diff --git a/${activemq.data}/kahadb/db.data b/${activemq.data}/kahadb/db.data
diff --git a/${activemq.data}/kahadb/db.redo b/${activemq.data}/kahadb/db.redo
diff --git a/${activemq.data}/kahadb/lock b/${activemq.data}/kahadb/lock
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,16 @@ local.properties
 /src/main/resources/rebel.xml
 .h2.server.properties
 
+######################
+# Intellij
+######################
+*.iws
+*.iml
+.idea_modules/
+.idea/
+atlassian-ide-plugin.xml
+out/
+
 # External tool builders
 .externalToolBuilders/**
 

diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
+        //maven{ url "http://artifactory-p.svb.org:80/artifactory/repo"}
         gradlePluginPortal()
         maven { url "https://repo.spring.io/plugins-release" }
     }
@@ -34,7 +35,7 @@ plugins {
 }
 
 group = "org.assimbly.gateway"
-version = '3.1.0'
+version = '3.2.0'
 
 description = ""
 
@@ -57,9 +58,6 @@ apply plugin: 'eclipse'
 
 configurations.all {
   exclude module: 'log4j-slf4j-impl'
-  resolutionStrategy {
-    force 'org.apache.activemq:artemis-core-client:2.11.0', 'org.apache.activemq:artemis-broker:2.11.0','org.apache.activemq:artemis-commons:2.11.0','org.apache.activemq:artemis-selector:2.11.0','org.apache.activemq:artemis-journal:2.11.0'
-  }
 }
 
 if (project.hasProperty("prod") || project.hasProperty("gae")) {
@@ -229,6 +227,7 @@ configurations {
 repositories {
     mavenLocal()
     mavenCentral()
+    //maven{ url "http://artifactory-p.svb.org:80/artifactory/repo"}
     jcenter()
     //jhipster-needle-gradle-repositories - JHipster will add additional repositories
 }
@@ -310,22 +309,16 @@ dependencies {
     implementation "org.mapstruct:mapstruct-jdk8:${mapstruct_version}"
 
 	// custom dependencies (non-jhipster)
-    implementation group: "org.assimbly", name: "connectorModule", version: "3.1.0", changing: true
-    implementation group: "org.assimbly", name: "brokerModule", version: "3.1.0", changing: true
+    implementation group: "org.assimbly", name: "connectorModule", version: "3.2.0", changing: true
+    implementation group: "org.assimbly", name: "brokerModule", version: "3.2.0", changing: true
 	implementation "io.github.assimbly:docconverter:1.3.0"
 	implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.3"
 	implementation "org.jdom:jdom2:2.0.6"
-	//implementation "io.hawt:hawtio-springboot:2.10.0"
+	implementation "io.hawt:hawtio-springboot:2.12.1"
 	implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
     // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz
     implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.0'
 
-	implementation group: 'org.apache.activemq', name: 'artemis-core-client', version: '2.16.0'
-	implementation group: 'org.apache.activemq', name: 'artemis-commons', version: '2.16.0'
-	implementation group: 'org.apache.activemq', name: 'artemis-server', version: '2.16.0'
-	implementation group: 'org.apache.activemq', name: 'artemis-selector', version: '2.16.0'
-	implementation group: 'org.apache.activemq', name: 'artemis-journal', version: '2.16.0'
-
 	//java 9+
 	implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
     implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'

diff --git a/gradle.properties b/gradle.properties
@@ -66,3 +66,17 @@ org.gradle.jvmargs=-Xmx1524m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryErro
 
 
 #org.gradle.configureondemand=true
+
+#systemProp.proxySet="true"
+
+#systemProp.http.keepAlive="true"
+#systemProp.http.proxyHost=proxyav.svb.org
+#systemProp.http.proxyPort=8080
+#systemProp.http.proxyUser=avrmeest
+#systemProp.http.proxyPassword=
+
+#systemProp.https.keepAlive="true"
+#systemProp.https.proxyHost=proxyav.svb.org
+#systemProp.https.proxyPort=8443
+#systemProp.https.proxyUser=avrmeest
+#systemProp.https.proxyPassword=
diff --git a/package json.old b/package json.old
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gateway",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "description": "A message gateway based on Apache camel",
     "private": true,
     "license": "Apache License 2.0",

diff --git a/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java b/src/main/java/org/assimbly/gateway/config/ApplicationProperties.java
@@ -69,6 +69,8 @@ public static class Gateway {
 
     	private String name;
     	private String baseDirectory;
+    	private boolean tracing;
+    	private boolean debugging;
 
         public String getName() {
             return name;
@@ -85,6 +87,24 @@ public String getBaseDirectory() {
         public void setBaseDirectory(String baseDirectory) {
             this.baseDirectory = baseDirectory;
         }
+
+        public boolean getTracing() {
+	        return tracing;
+	    }
+
+	    public void setName(boolean tracing) {
+	        this.tracing = tracing;
+	    }
+
+
+        public boolean getDebugging() {
+	        return debugging;
+	    }
+
+	    public void setDebugging(boolean debugging) {
+	        this.debugging = debugging;
+	    }
+
     }
 
 }