diff --git a/build.gradle b/build.gradle
index 9455fcedb..8efe58477 100644
--- a/build.gradle
+++ b/build.gradle
@@ -280,10 +280,7 @@ subprojects {
compile group: 'aopalliance', name: 'aopalliance', version: '1.0'
compile group: 'org.aspectj', name: 'aspectjtools', version: '1.9.4'
compile group: 'dom4j', name: 'dom4j', version: '1.6.1'
- //compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2'
- //compile group: 'xalan', name: 'serializer', version: '2.7.2'
- //compile group: 'xalan', name: 'xalan', version: '2.7.2'
- //compile group: 'xml-apis', name: 'xml-apis', version: '2.0.2'
+ compile group: 'xalan', name: 'serializer', version: '2.7.2'
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
compile group: 'javax.xml.bind', name: 'jaxb-core', version: '2.3.0.1'
compile group: 'javax.xml.bind', name: 'jaxb-impl', version: '2.3.0.1'
diff --git a/maxkey-web-manage/.classpath b/maxkey-web-manage/.classpath
index e576b4e91..2a1397787 100644
--- a/maxkey-web-manage/.classpath
+++ b/maxkey-web-manage/.classpath
@@ -13,9 +13,10 @@
+
-
+
diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle
index 500fc8569..3bf73a606 100644
--- a/maxkey-web-manage/build.gradle
+++ b/maxkey-web-manage/build.gradle
@@ -1,12 +1,22 @@
description = "maxkey-web-manage"
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
//apply plugin: 'war'
apply plugin: 'eclipse-wtp'
+apply plugin: 'com.bmuschko.tomcat-base'
+apply plugin: 'com.bmuschko.tomcat'
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath "com.bmuschko:gradle-tomcat-plugin:2.2.3"
+ }
+}
dependencies {
- //local jars
- compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
-
compile project(":maxkey-core")
compile project(":maxkey-jose-jwt")
compile project(":maxkey-dao")
diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
index 987bdab9b..b55939837 100644
--- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
+++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java
@@ -1,7 +1,5 @@
package org.maxkey;
-
-import java.io.File;
import java.util.Date;
import javax.servlet.ServletException;
@@ -26,7 +24,6 @@ import org.springframework.context.annotation.ImportResource;
)
public class MaxKeyMgtApplication extends SpringBootServletInitializer {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtApplication.class);
-
@Bean
MaxKeyMgtConfig MaxKeyMgtConfig() {
@@ -34,6 +31,8 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer {
}
public static void main(String[] args) {
+ System.out.println("MaxKeyMgtApplication");
+
ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyMgtApplication.class, args);
InitApplicationContext initWebContext=new InitApplicationContext(applicationContext);
diff --git a/maxkey-web-manage/src/main/java/org/maxkey/T.java b/maxkey-web-manage/src/main/java/org/maxkey/T.java
new file mode 100644
index 000000000..ca83c1526
--- /dev/null
+++ b/maxkey-web-manage/src/main/java/org/maxkey/T.java
@@ -0,0 +1,10 @@
+package org.maxkey;
+
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class T extends SpringBootServletInitializer {
+
+ public static void main(String[] args) {
+ System.out.println("MaxKeyMgtApplication");
+ }
+}