Adapt to changes in Argeo Commons

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 9d7d5579fe83de013e9a83bab45412429cb771fa..23632d5db7b185ed0771166ba57d6ddcc688517b 100644 (file)
--- 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 9bde05fc13971abb8aca824a0c6c4c1039c69132..6b21f8e9274b56a891e9647d68153fa433bcbea4 100644 (file)
--- 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 7089965b6967d126893ce5542a97f2ab9fcbd92e..73eeaefff73f4ebbd3a897b23edf50c183b06cb7 100644 (file)
--- 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 e7640c7c60f579d5c8d018fe22c97ee5144e7fd2..4d42d75e52d3274dbfe6a5fe4b89393c7ee24c38 100644 (file)
--- 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"