RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor package for stuff related to importers

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2012-08-27 10:04:16 +02:00
parent be119c7a06
commit b141fbb6ac
10 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libreplan-business/pom.xml
View file

@ -120,11 +120,6 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId>
</dependency>
<!-- MPXJ Library -->
<dependency>
<groupId>net.sourceforge</groupId>
<artifactId>mpxj</artifactId>
</dependency>
</dependencies>
<profiles>

5
libreplan-webapp/pom.xml
View file

@ -448,6 +448,11 @@
<groupId>br.com.digilabs.jqplot</groupId>
<artifactId>jqplot4java</artifactId>
</dependency>
<!-- MPXJ Library -->
<dependency>
<groupId>net.sourceforge</groupId>
<artifactId>mpxj</artifactId>
</dependency>
<!-- ZK fileupload -->
<dependency>
<groupId>commons-io</groupId>

2
libreplan-business/src/main/java/org/libreplan/business/orders/imports/IOrderImporter.java → libreplan-webapp/src/main/java/org/libreplan/importers/IOrderImporter.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.libreplan.business.orders.imports;
package org.libreplan.importers;
import java.io.InputStream;

2
libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java → libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.libreplan.business.orders.imports;
package org.libreplan.importers;
import java.util.ArrayList;
import java.util.List;

2
libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java → libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.libreplan.business.orders.imports;
package org.libreplan.importers;
import java.util.List;

2
libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java → libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.libreplan.business.orders.imports;
package org.libreplan.importers;
import java.util.List;

2
libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java → libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java
View file

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.libreplan.business.orders.imports;
package org.libreplan.importers;
import java.io.InputStream;
import java.util.ArrayList;

4
libreplan-webapp/src/main/java/org/libreplan/web/orders/imports/ProjectImportController.java → libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java
View file

@ -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;

2
libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul
View file

@ -30,7 +30,7 @@
<zk>
<window id="importProject" self="@{define(content)}"
apply="org.libreplan.web.orders.imports.ProjectImportController"
apply="org.libreplan.web.importers.ProjectImportController"
title="${i18n:_('Import Project')}">
<vbox id="messagesContainer" />

15
libreplan-business/src/test/java/org/libreplan/business/test/orders/imports/OrderImporterTest.java → libreplan-webapp/src/test/java/org/libreplan/importers/OrderImporterTest.java
View file

@ -17,12 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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