From b141fbb6ac6ff593dadfbbd451a3fcd8fbe02294 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 27 Aug 2012 10:04:16 +0200 Subject: [PATCH] Refactor package for stuff related to importers --- libreplan-business/pom.xml | 5 ----- libreplan-webapp/pom.xml | 5 +++++ .../org/libreplan/importers}/IOrderImporter.java | 2 +- .../importers}/MPXJProjectFileConversor.java | 2 +- .../java/org/libreplan/importers}/OrderDTO.java | 2 +- .../org/libreplan/importers}/OrderElementDTO.java | 2 +- .../libreplan/importers}/OrderImporterMPXJ.java | 2 +- .../ProjectImportController.java | 4 ++-- .../main/webapp/orders/imports/projectImport.zul | 2 +- .../libreplan/importers}/OrderImporterTest.java | 15 ++++++++++----- 10 files changed, 23 insertions(+), 18 deletions(-) rename {libreplan-business/src/main/java/org/libreplan/business/orders/imports => libreplan-webapp/src/main/java/org/libreplan/importers}/IOrderImporter.java (97%) rename {libreplan-business/src/main/java/org/libreplan/business/orders/imports => libreplan-webapp/src/main/java/org/libreplan/importers}/MPXJProjectFileConversor.java (99%) rename {libreplan-business/src/main/java/org/libreplan/business/orders/imports => libreplan-webapp/src/main/java/org/libreplan/importers}/OrderDTO.java (96%) rename {libreplan-business/src/main/java/org/libreplan/business/orders/imports => libreplan-webapp/src/main/java/org/libreplan/importers}/OrderElementDTO.java (96%) rename {libreplan-business/src/main/java/org/libreplan/business/orders/imports => libreplan-webapp/src/main/java/org/libreplan/importers}/OrderImporterMPXJ.java (99%) rename libreplan-webapp/src/main/java/org/libreplan/web/{orders/imports => importers}/ProjectImportController.java (96%) rename {libreplan-business/src/test/java/org/libreplan/business/test/orders/imports => libreplan-webapp/src/test/java/org/libreplan/importers}/OrderImporterTest.java (83%) diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml index a53ffc2a6..f4cd68969 100644 --- a/libreplan-business/pom.xml +++ b/libreplan-business/pom.xml @@ -120,11 +120,6 @@ org.liquibase liquibase-maven-plugin - - - net.sourceforge - mpxj - diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml index 2326f109d..bca3aebd7 100644 --- a/libreplan-webapp/pom.xml +++ b/libreplan-webapp/pom.xml @@ -448,6 +448,11 @@ br.com.digilabs.jqplot jqplot4java + + + net.sourceforge + mpxj + commons-io diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/IOrderImporter.java b/libreplan-webapp/src/main/java/org/libreplan/importers/IOrderImporter.java similarity index 97% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/IOrderImporter.java rename to libreplan-webapp/src/main/java/org/libreplan/importers/IOrderImporter.java index 1b691c870..53c1a247f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/IOrderImporter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/IOrderImporter.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.libreplan.business.orders.imports; +package org.libreplan.importers; import java.io.InputStream; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java similarity index 99% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java rename to libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java index 48aeff0de..79f7c3e80 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.libreplan.business.orders.imports; +package org.libreplan.importers; import java.util.ArrayList; import java.util.List; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java similarity index 96% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java rename to libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java index f18db381a..f2e243d26 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.libreplan.business.orders.imports; +package org.libreplan.importers; import java.util.List; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java similarity index 96% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java rename to libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java index 46d14768a..606b317fc 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.libreplan.business.orders.imports; +package org.libreplan.importers; import java.util.List; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java similarity index 99% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java rename to libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java index 22ae7c139..717b96d69 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.libreplan.business.orders.imports; +package org.libreplan.importers; import java.io.InputStream; import java.util.ArrayList; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/imports/ProjectImportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java similarity index 96% rename from libreplan-webapp/src/main/java/org/libreplan/web/orders/imports/ProjectImportController.java rename to libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java index 4d789971c..b5871c3fa 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/imports/ProjectImportController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java @@ -1,10 +1,10 @@ -package org.libreplan.web.orders.imports; +package org.libreplan.web.importers; import static org.libreplan.web.I18nHelper._; import java.io.InputStream; -import org.libreplan.business.orders.imports.IOrderImporter; +import org.libreplan.importers.IOrderImporter; import org.libreplan.web.common.IMessagesForUser; import org.libreplan.web.common.Level; import org.libreplan.web.common.MessagesForUser; diff --git a/libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul b/libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul index 1aa3459bb..6110f97d3 100644 --- a/libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul +++ b/libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul @@ -30,7 +30,7 @@ diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/orders/imports/OrderImporterTest.java b/libreplan-webapp/src/test/java/org/libreplan/importers/OrderImporterTest.java similarity index 83% rename from libreplan-business/src/test/java/org/libreplan/business/test/orders/imports/OrderImporterTest.java rename to libreplan-webapp/src/test/java/org/libreplan/importers/OrderImporterTest.java index 909642593..35c0dc216 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/orders/imports/OrderImporterTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/importers/OrderImporterTest.java @@ -17,12 +17,15 @@ * along with this program. If not, see . */ -package org.libreplan.business.test.orders.imports; +package org.libreplan.importers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; -import static org.libreplan.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE; +import static org.libreplan.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE; +import static org.libreplan.web.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONFIG_FILE; +import static org.libreplan.web.test.WebappGlobalNames.WEBAPP_SPRING_CONFIG_TEST_FILE; +import static org.libreplan.web.test.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONFIG_TEST_FILE; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -30,8 +33,8 @@ import java.io.InputStream; import org.junit.Test; import org.junit.runner.RunWith; -import org.libreplan.business.orders.imports.OrderDTO; -import org.libreplan.business.orders.imports.IOrderImporter; +import org.libreplan.importers.IOrderImporter; +import org.libreplan.importers.OrderDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,7 +46,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE, - BUSINESS_SPRING_CONFIG_TEST_FILE }) + WEBAPP_SPRING_CONFIG_FILE, WEBAPP_SPRING_CONFIG_TEST_FILE, + WEBAPP_SPRING_SECURITY_CONFIG_FILE, + WEBAPP_SPRING_SECURITY_CONFIG_TEST_FILE }) public class OrderImporterTest { @Autowired