From d755c2474b4c8b0bebaf84a3940ca7b6382441b6 Mon Sep 17 00:00:00 2001 From: cheetah100 Date: Thu, 5 May 2016 09:29:20 +1200 Subject: [PATCH] Modified the schemas in the Spring Configs so they would not make http calls on start. This way it is possible to start Gravity offline from the Internet. --- .../WEB-INF/spring/app/applicationContext.xml | 16 +++++++++------ .../webapp/WEB-INF/spring/app/automation.xml | 11 +++++----- .../webapp/WEB-INF/spring/app/db-config.xml | 20 ------------------- .../WEB-INF/spring/app/event-config.xml | 10 +++++----- .../webapp/WEB-INF/spring/app/repository.xml | 4 ++-- .../webapp/WEB-INF/spring/app/security.xml | 2 +- .../WEB-INF/spring/app/servlet-context.xml | 12 +++++++---- 7 files changed, 31 insertions(+), 44 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/spring/app/db-config.xml diff --git a/src/main/webapp/WEB-INF/spring/app/applicationContext.xml b/src/main/webapp/WEB-INF/spring/app/applicationContext.xml index d89bdde..e901c0c 100644 --- a/src/main/webapp/WEB-INF/spring/app/applicationContext.xml +++ b/src/main/webapp/WEB-INF/spring/app/applicationContext.xml @@ -4,11 +4,16 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:task="http://www.springframework.org/schema/task" xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/mvc + http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/task + http://www.springframework.org/schema/task/spring-task-3.1.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.1.xsd"> @@ -46,7 +51,6 @@ - diff --git a/src/main/webapp/WEB-INF/spring/app/automation.xml b/src/main/webapp/WEB-INF/spring/app/automation.xml index 9c069c1..ba2e2dd 100644 --- a/src/main/webapp/WEB-INF/spring/app/automation.xml +++ b/src/main/webapp/WEB-INF/spring/app/automation.xml @@ -4,18 +4,17 @@ xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jms="http://www.springframework.org/schema/jms" xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/jee - http://www.springframework.org/schema/jee/spring-jee-3.0.xsd + http://www.springframework.org/schema/jee/spring-jee-3.1.xsd http://www.springframework.org/schema/jms - http://www.springframework.org/schema/jms/spring-jms-3.0.xsd + http://www.springframework.org/schema/jms/spring-jms-3.1.xsd http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/util/spring-util-3.1.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/src/main/webapp/WEB-INF/spring/app/db-config.xml b/src/main/webapp/WEB-INF/spring/app/db-config.xml deleted file mode 100644 index c5adf73..0000000 --- a/src/main/webapp/WEB-INF/spring/app/db-config.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/spring/app/event-config.xml b/src/main/webapp/WEB-INF/spring/app/event-config.xml index f4394c4..af79643 100644 --- a/src/main/webapp/WEB-INF/spring/app/event-config.xml +++ b/src/main/webapp/WEB-INF/spring/app/event-config.xml @@ -4,17 +4,17 @@ xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jms="http://www.springframework.org/schema/jms" xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/jee - http://www.springframework.org/schema/jee/spring-jee-3.0.xsd + http://www.springframework.org/schema/jee/spring-jee-3.1.xsd http://www.springframework.org/schema/jms - http://www.springframework.org/schema/jms/spring-jms-3.0.xsd + http://www.springframework.org/schema/jms/spring-jms-3.1.xsd http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/util/spring-util-3.1.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/context/spring-context-3.1.xsd"> diff --git a/src/main/webapp/WEB-INF/spring/app/repository.xml b/src/main/webapp/WEB-INF/spring/app/repository.xml index e17ac9d..2ded906 100644 --- a/src/main/webapp/WEB-INF/spring/app/repository.xml +++ b/src/main/webapp/WEB-INF/spring/app/repository.xml @@ -4,11 +4,11 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jee="http://www.springframework.org/schema/jee" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/jee - http://www.springframework.org/schema/jee/spring-jee-3.0.xsd"> + http://www.springframework.org/schema/jee/spring-jee-3.1.xsd">