From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 6 Oct 2019 09:15:11 +0000 (+0200)
Subject: Adapt to changes in Argeo TP.
X-Git-Tag: argeo-slc-2.1.17~84
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=42938785f222beefa7c869efcbef1f27a53b3319;p=gpl%2Fargeo-slc.git

Adapt to changes in Argeo TP.
---

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 99e2f5659..ce864990d 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -48,4 +48,12 @@ org.eclipse.equinox.http.jetty.autostart=false
 org.eclipse.rap.workbenchAutostart=false
 
 # Avoid errors logs (see https://issues.apache.org/jira/browse/JCR-2226)
-org.apache.jackrabbit.core.statementcache=false
\ No newline at end of file
+org.apache.jackrabbit.core.statementcache=false
+
+org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\
+com.sun.jndi.ldap.sasl,\
+com.sun.security.jgss,\
+com.sun.jndi.dns,\
+com.sun.nio.file,\
+com.sun.nio.sctp,\
+com.sun.crypto.provider
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index abed9d2c5..baee5f845 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -35,12 +37,7 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Parent dependencies -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.sdk</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
+		<!-- SLC Minimal -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
@@ -105,6 +102,35 @@
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Legacy Argeo Commons platform (Eclipse 3) -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.platform</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>biz.aQute.bndlib</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.redline-rpm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.eclipse.jgit</artifactId>
+		</dependency>
+
+
 		<!-- For target platform generation -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index da7d737d3..8ae8da524 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -67,7 +67,7 @@
 		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bnd</artifactId>
+			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
@@ -77,30 +77,14 @@
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.redline-rpm</artifactId>
 		</dependency>
-
-		<!-- SLC Libs -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.lib.repo</artifactId> -->
-		<!-- <version>1.1.14-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.lib.jcr</artifactId> -->
-		<!-- <version>1.1.14-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-
-		<!-- Extensions <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.support</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> -->
-		<!-- UI <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.client.ui</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> <dependency> <groupId>org.argeo.slc</groupId> 
-			<artifactId>org.argeo.slc.client.ui.dist</artifactId> <version>2.1.13-SNAPSHOT</version> 
-			</dependency> <dependency> <groupId>org.argeo.slc</groupId> <artifactId>org.argeo.slc.client.rap</artifactId> 
-			<version>2.1.13-SNAPSHOT</version> </dependency> -->
-
-		<!-- For target platform generation <dependency> <groupId>org.argeo.slc</groupId> 
-			<artifactId>org.argeo.slc.unit</artifactId> <version>2.1.13-SNAPSHOT</version> 
-			<scope>test</scope> </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.eclipse.jgit</artifactId>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index 6270c1cf4..ab207def9 100644
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -38,7 +38,7 @@
 		<!-- BND -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bnd</artifactId>
+			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
index d53078ec5..5469487a1 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
@@ -253,10 +253,12 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 				}
 			}
 
-			if (nothingWasDone)
-				throw new SlcException("Nothing was done");
+			if (nothingWasDone) {
+				log.error("Nothing was done when wrapping " + uri + ". THE DISTRIBUTION IS INCONSISTENT.");
+				// throw new SlcException("Nothing was done");
+				// TODO Fail if not all wrappers matched
+			}
 
-			// FIXME Fail if not all wrappers matched
 		} catch (Exception e) {
 			throw new SlcException("Cannot wrap distribution " + uri, e);
 		} finally {
diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
index 3d83c07e7..56dda5bdf 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
@@ -44,7 +44,7 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
 		try {
 			byte[] jarBytes = IOUtils.toByteArray(in);
 
-			jar = new Jar(null, new ByteArrayInputStream(jarBytes));
+			jar = new Jar(name, new ByteArrayInputStream(jarBytes));
 			Manifest sourceManifest = jar.getManifest();
 
 			Version versionToUse;