diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index f39c3670..b7e2429d 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -2,17 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 wise-webapp - war WiseMapping Webapp http://www.wisemapping.org + 5.1.0-SNAPSHOT + - org.wisemapping - wisemapping - ../pom.xml - 5.1.0-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 3.1.2 + 5.1.0-SNAPSHOT + 17 + 17 6.0.11 6.1.2 6.2.6.Final @@ -33,6 +36,27 @@ 1.7 compile + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-mail + + org.testng testng @@ -45,39 +69,33 @@ 12.0 compile - - org.springframework - spring-webmvc - ${org.springframework.version} - compile - - - org.springframework - spring-messaging - ${org.springframework.version} - - - org.springframework - spring-websocket - ${org.springframework.version} - + + + + + + + + + + org.postgresql postgresql 42.5.4 - - org.springframework - spring-beans - ${org.springframework.version} - compile - - - org.springframework - spring-tx - ${org.springframework.version} - compile - + + + + + + + + + + + + org.springframework.security spring-security-taglibs @@ -90,6 +108,12 @@ 5.6.15.Final + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + + org.hibernate.validator @@ -97,78 +121,72 @@ 8.0.1.Final - - org.springframework - spring-orm - ${org.springframework.version} - compile - - - org.springframework - spring-context - ${org.springframework.version} - compile - - - org.springframework - spring-web - ${org.springframework.version} - compile - - - org.springframework - spring-oxm - ${org.springframework.version} - compile - - - org.springframework - spring-context-support - ${org.springframework.version} - compile - - - org.springframework.data - spring-data-jpa - 2.6.1 - - - org.springframework - spring-test - 5.3.15 - test - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - org.springframework - spring-aop - ${org.springframework.version} - runtime - - - org.springframework.security - spring-security-web - ${org.springframework.addons} - compile - - - org.springframework.security - spring-security-core - ${org.springframework.addons} - compile - - - org.springframework - spring-jdbc - ${org.springframework.version} - runtime - - - aopalliance - aopalliance - 1.0 - compile - + + + + + + + + + + + + + + + + + + + + + + + + jakarta.mail jakarta.mail-api @@ -179,21 +197,21 @@ mysql-connector-j 8.1.0 - - org.apache.commons - commons-dbcp2 - 2.9.0 - + + + + + - - - - - + + + + + org.apache.logging.log4j log4j-core @@ -282,10 +300,9 @@ org.hsqldb hsqldb - 2.7.1 + 2.7.2 - drop-schemas @@ -357,27 +374,6 @@ - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins maven-war-plugin @@ -418,6 +414,8 @@ + + org.apache.maven.plugins maven-surefire-plugin diff --git a/wise-webapp/src/main/java/com/wisemapping/config/AppConfig.java b/wise-webapp/src/main/java/com/wisemapping/config/AppConfig.java deleted file mode 100644 index 647863eb..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/config/AppConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.wisemapping.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.HandlerExceptionResolver; -import org.springframework.web.servlet.ViewResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; -import org.springframework.web.servlet.view.InternalResourceViewResolver; -import org.springframework.web.servlet.view.JstlView; - -@EnableWebMvc -@Configuration -public class AppConfig { - - @Bean - HandlerExceptionResolver errorHandler() { - final SimpleMappingExceptionResolver result = new SimpleMappingExceptionResolver(); - - //mapping status code with view response. - result.addStatusCode("reactInclude", 403); - - //setting default error view - result.setDefaultErrorView("reactInclude"); - result.setDefaultStatusCode(500); - return result; - } - - @Bean - public ViewResolver viewResolver(){ - InternalResourceViewResolver resolver = new InternalResourceViewResolver(); - resolver.setPrefix("/WEB-INF/views/"); - resolver.setSuffix(".jsp"); - resolver.setViewClass(JstlView.class); - return resolver; - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/config/Application.java b/wise-webapp/src/main/java/com/wisemapping/config/Application.java new file mode 100644 index 00000000..faf5c6e3 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/config/Application.java @@ -0,0 +1,56 @@ +package com.wisemapping.config; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.*; +import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; +import org.springframework.web.servlet.view.InternalResourceViewResolver; +import org.springframework.web.servlet.view.JstlView; + +import javax.sql.DataSource; + +@SpringBootApplication +@ImportResource("spring/wisemapping.xml") +@ComponentScan +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + HandlerExceptionResolver errorHandler() { + final SimpleMappingExceptionResolver result = new SimpleMappingExceptionResolver(); + + //mapping status code with view response. + result.addStatusCode("reactInclude", 403); + + //setting default error view + result.setDefaultErrorView("reactInclude"); + result.setDefaultStatusCode(500); + return result; + } + + @Bean + public ViewResolver viewResolver() { + InternalResourceViewResolver resolver = new InternalResourceViewResolver(); + resolver.setPrefix("/WEB-INF/views/"); + resolver.setSuffix(".jsp"); + resolver.setViewClass(JstlView.class); + return resolver; + } +// @Bean +// public DataSource getDataSource() { +// DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create(); +// dataSourceBuilder.username("SA"); +// dataSourceBuilder.password(""); +// dataSourceBuilder.url("jdbc:hsqldb:file:/db/wisemapping"); +// dataSourceBuilder.driverClassName("org.hsqldb.jdbc.JDBCDriver"); +// return dataSourceBuilder.build(); +// } + +} + + diff --git a/wise-webapp/src/main/java/com/wisemapping/config/SecurityConfig.java b/wise-webapp/src/main/java/com/wisemapping/config/SecurityConfig.java index fa362d4d..cd726619 100644 --- a/wise-webapp/src/main/java/com/wisemapping/config/SecurityConfig.java +++ b/wise-webapp/src/main/java/com/wisemapping/config/SecurityConfig.java @@ -20,9 +20,9 @@ import org.springframework.web.servlet.handler.HandlerMappingIntrospector; @Configuration -@EnableWebSecurity +//@EnableWebSecurity public class SecurityConfig { - @Autowired +// @Autowired UserService userService; @Value("${admin.user}") @@ -122,11 +122,11 @@ public class SecurityConfig { return http.authorizeHttpRequests( (auth) -> - auth.requestMatchers(restfullMapper.pattern("/static/**")).permitAll(). - requestMatchers(restfullMapper.pattern("/css/**")).permitAll(). - requestMatchers(restfullMapper.pattern("/js/**")).permitAll(). - requestMatchers(restfullMapper.pattern("/images/**")).permitAll(). - requestMatchers(restfullMapper.pattern("/*")).permitAll() + auth.requestMatchers("/static/**").permitAll(). + requestMatchers("/css/**").permitAll(). + requestMatchers("/js/**").permitAll(). + requestMatchers("/images/**").permitAll(). + requestMatchers("/*").permitAll() ).build(); } diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java index 1d8a5f8a..4f5e0887 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java @@ -21,11 +21,6 @@ package com.wisemapping.dao; import com.wisemapping.model.*; import com.wisemapping.util.ZipUtils; import jakarta.persistence.Query; -import org.hibernate.Criteria; -import org.hibernate.criterion.Junction; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.hibernate.criterion.SimpleExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springframework.orm.hibernate5.HibernateTemplate; @@ -62,13 +57,14 @@ public class MindmapManagerImpl @Override public List getHistoryFrom(int mindmapId) { - final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); - hibernateCriteria.add(Restrictions.eq("mindmapId", mindmapId)); - hibernateCriteria.addOrder(Order.desc("creationTime")); - - // This line throws errors in some environments, so getting all history and taking firsts 10 records - hibernateCriteria.setMaxResults(30); - return hibernateCriteria.list(); +// final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); +// hibernateCriteria.add(Restrictions.eq("mindmapId", mindmapId)); +// hibernateCriteria.addOrder(Order.desc("creationTime")); +// +// // This line throws errors in some environments, so getting all history and taking firsts 10 records +// hibernateCriteria.setMaxResults(30); +// return hibernateCriteria.list(); + return null; } @Override @@ -83,11 +79,11 @@ public class MindmapManagerImpl @Override public void purgeHistory(int mapId) throws IOException { - final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); - hibernateCriteria.add(Restrictions.eq("mindmapId", mapId)); - hibernateCriteria.addOrder(Order.desc("creationTime")); +// final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); +// hibernateCriteria.add(Restrictions.eq("mindmapId", mapId)); +// hibernateCriteria.addOrder(Order.desc("creationTime")); - final List historyList = hibernateCriteria.list(); + final List historyList = null; final Mindmap mindmap = this.getMindmapById(mapId); if (mindmap != null) { @@ -127,30 +123,31 @@ public class MindmapManagerImpl @Override public List search(MindMapCriteria criteria, int maxResult) { - final Criteria hibernateCriteria = currentSession().createCriteria(Mindmap.class); - //always search public maps - hibernateCriteria.add(Restrictions.like("public", Boolean.TRUE)); - - if (criteria != null) { - final Junction junction; - if (criteria.isOrCriteria()) { - junction = Restrictions.disjunction(); - } else { - junction = Restrictions.conjunction(); - } - - if (criteria.getTitle() != null && criteria.getTitle().length() > 0) { - final SimpleExpression titleRestriction = Restrictions.like("title", "%" + criteria.getTitle() + "%"); - junction.add(titleRestriction); - } - - if (criteria.getDescription() != null && criteria.getDescription().length() > 0) { - final SimpleExpression descriptionRestriction = Restrictions.like("description", "%" + criteria.getDescription() + "%"); - junction.add(descriptionRestriction); - } - hibernateCriteria.add(junction); - } - return hibernateCriteria.list(); +// final Criteria hibernateCriteria = currentSession().createCriteria(Mindmap.class); +// //always search public maps +// hibernateCriteria.add(Restrictions.like("public", Boolean.TRUE)); +// +// if (criteria != null) { +// final Junction junction; +// if (criteria.isOrCriteria()) { +// junction = Restrictions.disjunction(); +// } else { +// junction = Restrictions.conjunction(); +// } +// +// if (criteria.getTitle() != null && criteria.getTitle().length() > 0) { +// final SimpleExpression titleRestriction = Restrictions.like("title", "%" + criteria.getTitle() + "%"); +// junction.add(titleRestriction); +// } +// +// if (criteria.getDescription() != null && criteria.getDescription().length() > 0) { +// final SimpleExpression descriptionRestriction = Restrictions.like("description", "%" + criteria.getDescription() + "%"); +// junction.add(descriptionRestriction); +// } +// hibernateCriteria.add(junction); +// } +// return hibernateCriteria.list(); + return null; } @Override @@ -221,17 +218,17 @@ public class MindmapManagerImpl @Override public void removeMindmap(@NotNull final Mindmap mindmap) { - // Delete history first ... - final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); - hibernateCriteria.add(Restrictions.eq("mindmapId", mindmap.getId())); - final List list = hibernateCriteria.list(); - getHibernateTemplate().deleteAll(list); - - // Remove collaborations ... - mindmap.removedCollaboration(mindmap.getCollaborations()); - - // Delete mindmap .... - getHibernateTemplate().delete(mindmap); +// // Delete history first ... +// final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); +// hibernateCriteria.add(Restrictions.eq("mindmapId", mindmap.getId())); +// final List list = hibernateCriteria.list(); +// getHibernateTemplate().deleteAll(list); +// +// // Remove collaborations ... +// mindmap.removedCollaboration(mindmap.getCollaborations()); +// +// // Delete mindmap .... +// getHibernateTemplate().delete(mindmap); } private void saveHistory(@NotNull final Mindmap mindMap) { diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/resources/config/application.properties similarity index 89% rename from wise-webapp/src/main/webapp/WEB-INF/app.properties rename to wise-webapp/src/main/resources/config/application.properties index 0046539e..dcb6eeca 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/wise-webapp/src/main/resources/config/application.properties @@ -23,6 +23,7 @@ # HSQL Configuration properties +database.base.url=/Users/veigap/repos/wisemapping-open-source/wise-webapp/target/ database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping database.driver=org.hsqldb.jdbc.JDBCDriver database.hibernate.dialect=org.hibernate.dialect.HSQLDialect @@ -89,7 +90,7 @@ google.recaptcha2.secretKey = 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe admin.user = admin@wisemapping.org # Base URL where WiseMapping is deployed. By default, It will be automatically inferred. -#site.baseurl = http://localhost:8080 +site.baseurl = http://localhost:8080 # Site Homepage URL. This will be used as URL for homepage location. site.homepage = c/login @@ -149,9 +150,7 @@ security.oauth2.google.confirmUrl=https://oauth2.googleapis.com/token # Google service for get user data (name, email, etc) security.oauth2.google.userinfoUrl=https://www.googleapis.com/oauth2/v3/userinfo # Url for starting auth process with google -security.oauth2.google.url=https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=${security.oauth2.google.callbackUrl}&prompt=consent&response_type=code&client_id=${security.oauth2.google.clientId}&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&access_type=offline&state=wisemapping&include_granted_scopes=true - - +security.oauth2.google.url=https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=${security.oauth2.google.callbackUrl:''}&prompt=consent&response_type=code&client_id=${security.oauth2.google.clientId:''}&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&access_type=offline&state=wisemapping&include_granted_scopes=true ####################################################################################### @@ -161,3 +160,10 @@ security.oauth2.google.url=https://accounts.google.com/o/oauth2/v2/auth?redirect # Coma separated list of domains and emails ban #accounts.exclusion.domain= + +#spring.main.allow-bean-definition-overriding=true + +spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver +spring.datasource.url=jdbc:hsqldb:file:/Users/veigap/repos/wisemapping-open-source/wise-webapp/target/db/wisemapping +spring.datasource.username=sa +spring.datasource.password= diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j2-stdout.xml b/wise-webapp/src/main/resources/log4j2-stdout.xml similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/classes/log4j2-stdout.xml rename to wise-webapp/src/main/resources/log4j2-stdout.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j2.xml b/wise-webapp/src/main/resources/log4j2.xml similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/classes/log4j2.xml rename to wise-webapp/src/main/resources/log4j2.xml diff --git a/wise-webapp/src/main/resources/public/static/mindplot b/wise-webapp/src/main/resources/public/static/mindplot new file mode 120000 index 00000000..351e6f9d --- /dev/null +++ b/wise-webapp/src/main/resources/public/static/mindplot @@ -0,0 +1 @@ +../../../../../wise-ui/target/wisemapping-mindplot/package/dist \ No newline at end of file diff --git a/wise-webapp/src/main/resources/public/static/webapp b/wise-webapp/src/main/resources/public/static/webapp new file mode 120000 index 00000000..7173cbf4 --- /dev/null +++ b/wise-webapp/src/main/resources/public/static/webapp @@ -0,0 +1 @@ +../../../../../wise-ui/target/wisemapping-webapp/package/dist \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml b/wise-webapp/src/main/resources/spring/wisemapping-aop.xml similarity index 96% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml rename to wise-webapp/src/main/resources/spring/wisemapping-aop.xml index 3056c4c1..3ef98f73 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml +++ b/wise-webapp/src/main/resources/spring/wisemapping-aop.xml @@ -22,7 +22,7 @@ - + save* diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/resources/spring/wisemapping-dao.xml similarity index 97% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml rename to wise-webapp/src/main/resources/spring/wisemapping-dao.xml index 8d893943..2861ec7c 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml +++ b/wise-webapp/src/main/resources/spring/wisemapping-dao.xml @@ -5,7 +5,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - + com.wisemapping.model.User diff --git a/wise-webapp/src/main/resources/spring/wisemapping-datasource.xml b/wise-webapp/src/main/resources/spring/wisemapping-datasource.xml new file mode 100644 index 00000000..e06504cf --- /dev/null +++ b/wise-webapp/src/main/resources/spring/wisemapping-datasource.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml b/wise-webapp/src/main/resources/spring/wisemapping-model.xml similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml rename to wise-webapp/src/main/resources/spring/wisemapping-model.xml diff --git a/wise-webapp/src/main/resources/spring/wisemapping-rest.xml b/wise-webapp/src/main/resources/spring/wisemapping-rest.xml new file mode 100644 index 00000000..6e903836 --- /dev/null +++ b/wise-webapp/src/main/resources/spring/wisemapping-rest.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml b/wise-webapp/src/main/resources/spring/wisemapping-security-db.xml similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml rename to wise-webapp/src/main/resources/spring/wisemapping-security-db.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml b/wise-webapp/src/main/resources/spring/wisemapping-security-ldap.xml similarity index 100% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml rename to wise-webapp/src/main/resources/spring/wisemapping-security-ldap.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml b/wise-webapp/src/main/resources/spring/wisemapping-service.xml similarity index 73% rename from wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml rename to wise-webapp/src/main/resources/spring/wisemapping-service.xml index 40adf514..661ea6eb 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml +++ b/wise-webapp/src/main/resources/spring/wisemapping-service.xml @@ -1,33 +1,28 @@ + http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - - - + - - - + + + @@ -49,7 +44,7 @@ - + @@ -60,17 +55,17 @@ - - - - - txInterceptor - viewSecurityAdvisor - updateSecurityAdvisor - - - - + + + + + + + + + + + @@ -102,8 +97,7 @@ - - + @@ -111,14 +105,14 @@ - - - - - messages - - - + + + + + + + + - + diff --git a/wise-webapp/src/main/resources/spring/wisemapping-servlet.xml b/wise-webapp/src/main/resources/spring/wisemapping-servlet.xml new file mode 100644 index 00000000..136df01d --- /dev/null +++ b/wise-webapp/src/main/resources/spring/wisemapping-servlet.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/wise-webapp/src/main/resources/spring/wisemapping.xml b/wise-webapp/src/main/resources/spring/wisemapping.xml new file mode 100644 index 00000000..b9a6e5bd --- /dev/null +++ b/wise-webapp/src/main/resources/spring/wisemapping.xml @@ -0,0 +1,26 @@ + + + + + + + + messages + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/web.xml b/wise-webapp/src/main/webapp/WEB-INF/web.xml index d46cd453..a5d451f8 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/web.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/web.xml @@ -90,29 +90,29 @@ org.springframework.web.context.ContextLoaderListener - - mvc-servlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - /WEB-INF/wisemapping-servlet.xml - - - 1 - + + + + + + + + + + + - - mvc-rest - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - /WEB-INF/wisemapping-rest.xml - - - 1 - + + + + + + + + + + + mvc-servlet diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-datasource.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-datasource.xml deleted file mode 100644 index 1a33feff..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-datasource.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml deleted file mode 100644 index f6d279e1..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - messages - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml deleted file mode 100644 index 847e46b6..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - messages - - - -