From 9dfb6be516fb364489b69d791e037e94071b2b08 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Mar 2019 15:45:21 +0100
Subject: [PATCH] Adapt to changes in Argeo Commons

---
 .../META-INF/spring/editors.xml               |  4 --
 .../META-INF/spring/jcr.xml                   |  5 --
 .../META-INF/spring/views.xml                 | 66 +++++++++----------
 org.argeo.slc.client.ui.dist/plugin.xml       |  2 +
 4 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
index 9d7d5579f..23632d5db 100644
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
@@ -5,10 +5,6 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-	<!-- LEGACY -->
-	<!-- <bean id="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" class="org.argeo.eclipse.ui.jcr.editors.GenericJcrQueryEditor" 
-		scope="prototype"> <property name="session" ref="slcSession" /> </bean> -->
-		
 	<bean id="distWorkspaceEditor"
 		class="org.argeo.slc.client.ui.dist.editors.DistWorkspaceEditor"
 		scope="prototype">
diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
index 9bde05fc1..6b21f8e92 100644
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
@@ -5,11 +5,6 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-	<bean id="slcSession" class="org.argeo.jcr.spring.ThreadBoundSession">
-		<property name="repository" ref="javaRepository" />
-		<property name="workspace" value="org.argeo.tp-1.3.1" />
-	</bean>
-
 	<bean id="repoService" class="org.argeo.slc.repo.core.RepoServiceImpl">
 		<property name="repositoryFactory" ref="repositoryFactory" />
 		<property name="keyring" ref="keyring" />
diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
index 7089965b6..73eeaefff 100644
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
@@ -8,40 +8,40 @@
         http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<!-- Views -->
-	<bean id="artifactsBrowser" class="org.argeo.slc.client.ui.dist.views.ArtifactsBrowser"
-		scope="prototype">
-		<property name="jcrSession" ref="slcSession" />
-	</bean>
-	<bean id="queryArtifactsForm" class="org.argeo.slc.client.ui.dist.views.QueryArtifactsForm"
-		scope="prototype">
-		<property name="session" ref="slcSession" />
-		<property name="columnProperties">
-			<list>
-				<value>slc:artifactVersion.jcr:uuid</value>
-				<value>slc:artifactVersion.slc:groupId</value>
-				<value>slc:artifactVersion.slc:artifactId</value>
-				<value>slc:artifactVersion.slc:artifactVersion</value>
-			</list>
-		</property>
-	</bean>
-	<bean id="queryBundlesForm" class="org.argeo.slc.client.ui.dist.views.QueryBundlesForm"
-		scope="prototype">
-		<property name="session" ref="slcSession" />
-		<property name="columnProperties">
-			<list>
-				<value>slc:artifactVersion.jcr:uuid</value>
-				<value>slc:bundleArtifact.slc:symbolic-name</value>
-				<value>slc:artifactVersion.slc:groupId</value>
-				<value>slc:bundleArtifact.slc:bundle-version</value>
-				<!-- <value>slc:bundleArtifact.slc:Fragment-Host</value> -->
-			</list>
-		</property>
-	</bean>
+<!-- 	<bean id="artifactsBrowser" class="org.argeo.slc.client.ui.dist.views.ArtifactsBrowser" -->
+<!-- 		scope="prototype"> -->
+<!-- 		<property name="jcrSession" ref="slcSession" /> -->
+<!-- 	</bean> -->
+<!-- 	<bean id="queryArtifactsForm" class="org.argeo.slc.client.ui.dist.views.QueryArtifactsForm" -->
+<!-- 		scope="prototype"> -->
+<!-- 		<property name="session" ref="slcSession" /> -->
+<!-- 		<property name="columnProperties"> -->
+<!-- 			<list> -->
+<!-- 				<value>slc:artifactVersion.jcr:uuid</value> -->
+<!-- 				<value>slc:artifactVersion.slc:groupId</value> -->
+<!-- 				<value>slc:artifactVersion.slc:artifactId</value> -->
+<!-- 				<value>slc:artifactVersion.slc:artifactVersion</value> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
+<!-- 	<bean id="queryBundlesForm" class="org.argeo.slc.client.ui.dist.views.QueryBundlesForm" -->
+<!-- 		scope="prototype"> -->
+<!-- 		<property name="session" ref="slcSession" /> -->
+<!-- 		<property name="columnProperties"> -->
+<!-- 			<list> -->
+<!-- 				<value>slc:artifactVersion.jcr:uuid</value> -->
+<!-- 				<value>slc:bundleArtifact.slc:symbolic-name</value> -->
+<!-- 				<value>slc:artifactVersion.slc:groupId</value> -->
+<!-- 				<value>slc:bundleArtifact.slc:bundle-version</value> -->
+<!-- 				<value>slc:bundleArtifact.slc:Fragment-Host</value> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
 
-	<bean id="queryArtifactsText" class="org.argeo.slc.client.ui.dist.views.QueryArtifactsText"
-		scope="prototype">
-		<property name="session" ref="slcSession" />
-	</bean>
+<!-- 	<bean id="queryArtifactsText" class="org.argeo.slc.client.ui.dist.views.QueryArtifactsText" -->
+<!-- 		scope="prototype"> -->
+<!-- 		<property name="session" ref="slcSession" /> -->
+<!-- 	</bean> -->
 
 	<bean id="distributionsView" class="org.argeo.slc.client.ui.dist.views.DistributionsView"
 		scope="prototype">
diff --git a/org.argeo.slc.client.ui.dist/plugin.xml b/org.argeo.slc.client.ui.dist/plugin.xml
index e7640c7c6..4d42d75e5 100644
--- a/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/org.argeo.slc.client.ui.dist/plugin.xml
@@ -38,6 +38,7 @@
             icon="icons/help.gif"
             name="About">
 		</view>
+		<!--
 		<view
             class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.slc.client.ui.dist.artifactsBrowser"
@@ -62,6 +63,7 @@
             icon="icons/search.gif"
             name="Query builder">
 		</view>
+		-->
 		<view
 	         name="Progress View"
 	         icon="icons/pview.gif"
-- 
2.39.2