From e80a8ae5c0b59bac7e83733458bf18eb097653d8 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 15 Mar 2018 11:44:13 +0100
Subject: [PATCH] Adapt to changes in Argeo Connect

---
 dep/org.argeo.suite.platform/pom.xml          | 12 +--
 .../META-INF/spring/backend-services.xml      |  2 +-
 .../workbench/commands/ImportEntities.java    |  3 +-
 .../suite/workbench/commands/JxlUtils.java    | 82 +++++++++++++++++++
 pom.xml                                       | 25 +++---
 5 files changed, 103 insertions(+), 21 deletions(-)
 create mode 100644 org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/JxlUtils.java

diff --git a/dep/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml
index 5d34a80..4e6153d 100644
--- a/dep/org.argeo.suite.platform/pom.xml
+++ b/dep/org.argeo.suite.platform/pom.xml
@@ -23,11 +23,6 @@
 			<artifactId>org.argeo.suite.workbench.rap</artifactId>
 			<version>0.1.13-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.connect</groupId>
-			<artifactId>org.argeo.theme.argeo2</artifactId>
-			<version>2.1.79-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.suite</groupId>
 			<artifactId>org.argeo.suite.web</artifactId>
@@ -40,6 +35,13 @@
 			<artifactId>org.argeo.connect.platform</artifactId>
 			<version>${version.argeo-connect}</version>
 		</dependency>
+		
+		<!-- Argeo TP Extras -->
+		<dependency>
+			<groupId>org.argeo.tp.payment</groupId>
+			<artifactId>com.stripe</artifactId>
+		</dependency>
+		
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/org.argeo.suite.apps/META-INF/spring/backend-services.xml b/org.argeo.suite.apps/META-INF/spring/backend-services.xml
index d8b2e4e..3fdd310 100644
--- a/org.argeo.suite.apps/META-INF/spring/backend-services.xml
+++ b/org.argeo.suite.apps/META-INF/spring/backend-services.xml
@@ -26,7 +26,7 @@
 		<property name="activitiesService" ref="activitiesService" />
 	</bean>
 
-	<bean id="documentsService" class="org.argeo.documents.DocumentsService" />
+	<bean id="documentsService" class="org.argeo.documents.core.DocumentsServiceImpl" />
 
 	<!-- order is important -->
 	<util:list id="knownAppServices">
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
index 1771486..b9906e9 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
@@ -1,7 +1,7 @@
 package org.argeo.suite.workbench.commands;
 
-import static org.argeo.connect.util.JxlUtils.getStringValue;
 import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
+import static org.argeo.suite.workbench.commands.JxlUtils.getStringValue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,7 +31,6 @@ import org.argeo.connect.ConnectNames;
 import org.argeo.connect.resources.ResourcesNames;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.connect.util.ConnectJcrUtils;
-import org.argeo.connect.util.JxlUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.people.ContactValueCatalogs;
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/JxlUtils.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/JxlUtils.java
new file mode 100644
index 0000000..8be4fa4
--- /dev/null
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/JxlUtils.java
@@ -0,0 +1,82 @@
+package org.argeo.suite.workbench.commands;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.argeo.connect.ConnectException;
+import org.argeo.eclipse.ui.EclipseUiUtils;
+
+import jxl.Cell;
+import jxl.CellType;
+import jxl.JXLException;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.WorkbookSettings;
+
+/** Centralise useful methods to simplify development with JXL library */
+class JxlUtils {
+
+	public static boolean isEmptyCell(Sheet sheet, int x, int y) {
+		Cell cell = sheet.getCell(x, y);
+		CellType type = cell.getType();
+		return type == CellType.EMPTY;
+	}
+
+	public static String getStringValue(Sheet sheet, int x, int y) {
+		Cell cell = sheet.getCell(x, y);
+		CellType type = cell.getType();
+		String stringValue = null;
+		if (type == CellType.LABEL || type == CellType.NUMBER)
+			stringValue = cell.getContents();
+		return stringValue;
+	}
+
+	public static String getCompulsoryStringValue(Sheet sheet, int x, int y) {
+		Cell cell = sheet.getCell(x, y);
+		CellType type = cell.getType();
+		String stringValue = null;
+		if (type == CellType.LABEL)
+			stringValue = cell.getContents();
+		else if (type == CellType.NUMBER)
+			stringValue = cell.getContents();
+		if (EclipseUiUtils.isEmpty(stringValue))
+			throw new ConnectException("No name defined at [" + x + "," + y + "], cannot parse indicator file");
+		return stringValue;
+	}
+
+	public static Double getNumberValue(Sheet sheet, int x, int y) {
+		Cell cell = sheet.getCell(x, y);
+		CellType type = cell.getType();
+		if (type == CellType.NUMBER)
+			return new Double(cell.getContents());
+		else if (type == CellType.EMPTY)
+			return null;
+		else
+			throw new ConnectException("Not a number at [" + x + "," + y + "]: " + type.toString());
+	}
+
+	public static Sheet getOnlySheet(InputStream in, String encoding) throws IOException {
+		Workbook wkb = toWorkbook(in, encoding);
+		Sheet sheet = wkb.getSheet(0);
+		return sheet;
+	}
+
+	public static Sheet getSheet(InputStream in, String encoding, int index) throws IOException {
+		Workbook wkb = toWorkbook(in, encoding);
+		return wkb.getSheet(index);
+	}
+
+	public static Workbook toWorkbook(InputStream in, String encoding) throws IOException {
+		try {
+			WorkbookSettings ws = new WorkbookSettings();
+			ws.setEncoding(encoding);
+			return Workbook.getWorkbook(in, ws);
+		} catch (JXLException e) {
+			throw new ConnectException("Unable to open XLS file", e);
+		}
+	}
+
+	// Prevents instantiation
+	private JxlUtils() {
+	}
+}
diff --git a/pom.xml b/pom.xml
index 93226c0..d68ade0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<modules>
 		<module>org.argeo.suite.web</module>
 		<module>org.argeo.suite.workbench.rap</module>
-<!-- 		<module>org.argeo.suite.theme.argeo2</module> -->
+		<!-- <module>org.argeo.suite.theme.argeo2</module> -->
 		<module>org.argeo.suite.apps</module>
 		<module>org.argeo.suite.apps.web</module>
 		<module>dep</module>
@@ -80,18 +80,6 @@ which are used as well as that of the covered work.]]>
 				<role>QA</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>bsinou</id>
-			<name>Bruno Sinou</name>
-			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
-			<organization>Argeo</organization>
-			<organizationUrl>http://www.argeo.org</organizationUrl>
-			<roles>
-				<role>architect</role>
-				<role>developer</role>
-				<role>QA</role>
-			</roles>
-		</developer>
 	</developers>
 	<build>
 		<plugins>
@@ -104,6 +92,17 @@ which are used as well as that of the covered work.]]>
 			</plugin>
 		</plugins>
 	</build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
 		<!-- RAP workbench -->
 		<dependency>
-- 
2.30.2