Improve repo and GIS

git-svn-id: https://svn.argeo.org/slc/trunk@4159 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/slc-client-rcp-dev.product b/demo/slc-client-rcp-dev.product
new file mode 100644 (file)
index 0000000..691f5e6
--- /dev/null
+++ b/demo/slc-client-rcp-dev.product
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="SLC" uid="org.argeo.slc.client.rcp.product" id="org.argeo.slc.client.rcp.product" application="org.argeo.slc.client.rcp.application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-console</programArgs>
+      <vmArgs>-Dlog4j.configuration=file:${system_property:user.home}/dev/src/slc/demo/log4j.properties -Dorg.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="icons/argeo-icon-256.png"/>
+
+   <launcher>
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="com.springsource.antlr"/>
+      <plugin id="com.springsource.bsh"/>
+      <plugin id="com.springsource.com.jcraft.jsch"/>
+      <plugin id="com.springsource.com.lowagie.text"/>
+      <plugin id="com.springsource.com.mysql.jdbc"/>
+      <plugin id="com.springsource.com.sun.syndication"/>
+      <plugin id="com.springsource.com.thoughtworks.xstream"/>
+      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
+      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
+      <plugin id="com.springsource.javassist"/>
+      <plugin id="com.springsource.javax.activation"/>
+      <plugin id="com.springsource.javax.annotation"/>
+      <plugin id="com.springsource.javax.ejb"/>
+      <plugin id="com.springsource.javax.el"/>
+      <plugin id="com.springsource.javax.jms"/>
+      <plugin id="com.springsource.javax.mail"/>
+      <plugin id="com.springsource.javax.management.j2ee"/>
+      <plugin id="com.springsource.javax.media.jai.codec"/>
+      <plugin id="com.springsource.javax.media.jai.core"/>
+      <plugin id="com.springsource.javax.persistence"/>
+      <plugin id="com.springsource.javax.resource"/>
+      <plugin id="com.springsource.javax.servlet"/>
+      <plugin id="com.springsource.javax.servlet.jsp"/>
+      <plugin id="com.springsource.javax.servlet.jsp.jstl"/>
+      <plugin id="com.springsource.javax.transaction"/>
+      <plugin id="com.springsource.javax.xml.bind"/>
+      <plugin id="com.springsource.javax.xml.rpc"/>
+      <plugin id="com.springsource.javax.xml.soap"/>
+      <plugin id="com.springsource.javax.xml.stream"/>
+      <plugin id="com.springsource.javax.xml.ws"/>
+      <plugin id="com.springsource.jcifs"/>
+      <plugin id="com.springsource.jdbm"/>
+      <plugin id="com.springsource.json"/>
+      <plugin id="com.springsource.junit"/>
+      <plugin id="com.springsource.jxl"/>
+      <plugin id="com.springsource.net.sf.cglib"/>
+      <plugin id="com.springsource.net.sf.ehcache"/>
+      <plugin id="com.springsource.net.sourceforge.jtds"/>
+      <plugin id="com.springsource.org.antlr"/>
+      <plugin id="com.springsource.org.aopalliance"/>
+      <plugin id="com.springsource.org.apache.bsf"/>
+      <plugin id="com.springsource.org.apache.commons.beanutils"/>
+      <plugin id="com.springsource.org.apache.commons.codec"/>
+      <plugin id="com.springsource.org.apache.commons.collections"/>
+      <plugin id="com.springsource.org.apache.commons.compress"/>
+      <plugin id="com.springsource.org.apache.commons.dbcp"/>
+      <plugin id="com.springsource.org.apache.commons.fileupload"/>
+      <plugin id="com.springsource.org.apache.commons.httpclient"/>
+      <plugin id="com.springsource.org.apache.commons.io"/>
+      <plugin id="com.springsource.org.apache.commons.lang"/>
+      <plugin id="com.springsource.org.apache.commons.net"/>
+      <plugin id="com.springsource.org.apache.commons.pool"/>
+      <plugin id="com.springsource.org.apache.commons.vfs"/>
+      <plugin id="com.springsource.org.apache.derby"/>
+      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
+      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
+      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
+      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
+      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
+      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
+      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
+      <plugin id="com.springsource.org.apache.log4j"/>
+      <plugin id="com.springsource.org.apache.lucene"/>
+      <plugin id="com.springsource.org.apache.mina"/>
+      <plugin id="com.springsource.org.apache.oro"/>
+      <plugin id="com.springsource.org.apache.regexp"/>
+      <plugin id="com.springsource.org.apache.taglibs.standard"/>
+      <plugin id="com.springsource.org.apache.tools.ant"/>
+      <plugin id="com.springsource.org.apache.tools.ant.launch"/>
+      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
+      <plugin id="com.springsource.org.apache.xalan"/>
+      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
+      <plugin id="com.springsource.org.apache.xml.resolver"/>
+      <plugin id="com.springsource.org.apache.xml.serializer"/>
+      <plugin id="com.springsource.org.apache.xmlbeans"/>
+      <plugin id="com.springsource.org.apache.xmlcommons"/>
+      <plugin id="com.springsource.org.aspectj.runtime"/>
+      <plugin id="com.springsource.org.aspectj.weaver"/>
+      <plugin id="com.springsource.org.castor"/>
+      <plugin id="com.springsource.org.codehaus.jackson"/>
+      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
+      <plugin id="com.springsource.org.cyberneko.html"/>
+      <plugin id="com.springsource.org.dbunit"/>
+      <plugin id="com.springsource.org.dom4j"/>
+      <plugin id="com.springsource.org.h2"/>
+      <plugin id="com.springsource.org.hibernate"/>
+      <plugin id="com.springsource.org.hsqldb"/>
+      <plugin id="com.springsource.org.jaxen"/>
+      <plugin id="com.springsource.org.jdom"/>
+      <plugin id="com.springsource.org.jgroups"/>
+      <plugin id="com.springsource.org.mortbay.jetty.server"/>
+      <plugin id="com.springsource.org.mortbay.util"/>
+      <plugin id="com.springsource.org.objectweb.asm"/>
+      <plugin id="com.springsource.org.postgresql.jdbc3"/>
+      <plugin id="com.springsource.org.quartz"/>
+      <plugin id="com.springsource.org.tmatesoft.svn"/>
+      <plugin id="com.springsource.org.xmlpull"/>
+      <plugin id="com.springsource.slf4j.api"/>
+      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
+      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
+      <plugin id="org.argeo.basic.nodeps"/>
+      <plugin id="org.argeo.dep.org.freecompany.redline"/>
+      <plugin id="org.argeo.dep.osgi.activemq"/>
+      <plugin id="org.argeo.dep.osgi.activemq.optional" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.aether"/>
+      <plugin id="org.argeo.dep.osgi.boilerpipe"/>
+      <plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
+      <plugin id="org.argeo.dep.osgi.commons.cli"/>
+      <plugin id="org.argeo.dep.osgi.commons.exec"/>
+      <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.drewnoakes.metadata_extractor"/>
+      <plugin id="org.argeo.dep.osgi.geoapi"/>
+      <plugin id="org.argeo.dep.osgi.geotools"/>
+      <plugin id="org.argeo.dep.osgi.jackrabbit"/>
+      <plugin id="org.argeo.dep.osgi.jai.imageio"/>
+      <plugin id="org.argeo.dep.osgi.java3d"/>
+      <plugin id="org.argeo.dep.osgi.jcr"/>
+      <plugin id="org.argeo.dep.osgi.jsr275"/>
+      <plugin id="org.argeo.dep.osgi.jts"/>
+      <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.netcdf"/>
+      <plugin id="org.argeo.dep.osgi.pdfbox"/>
+      <plugin id="org.argeo.dep.osgi.poi"/>
+      <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
+      <plugin id="org.argeo.dep.osgi.tagsoup"/>
+      <plugin id="org.argeo.dep.osgi.tika"/>
+      <plugin id="org.argeo.eclipse.ui"/>
+      <plugin id="org.argeo.eclipse.ui.jcr"/>
+      <plugin id="org.argeo.security.activemq"/>
+      <plugin id="org.argeo.security.core"/>
+      <plugin id="org.argeo.security.equinox"/>
+      <plugin id="org.argeo.security.ldap"/>
+      <plugin id="org.argeo.security.manager.ldap"/>
+      <plugin id="org.argeo.security.services"/>
+      <plugin id="org.argeo.security.ui"/>
+      <plugin id="org.argeo.security.ui.application"/>
+      <plugin id="org.argeo.server.ads"/>
+      <plugin id="org.argeo.server.ads.server"/>
+      <plugin id="org.argeo.server.core"/>
+      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.server.jackrabbit"/>
+      <plugin id="org.argeo.server.jcr"/>
+      <plugin id="org.argeo.server.jdbc" fragment="true"/>
+      <plugin id="org.argeo.server.json"/>
+      <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.slc.agent"/>
+      <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
+      <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
+      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
+      <plugin id="org.argeo.slc.client.agent"/>
+      <plugin id="org.argeo.slc.client.commons"/>
+      <plugin id="org.argeo.slc.client.core"/>
+      <plugin id="org.argeo.slc.client.gis"/>
+      <plugin id="org.argeo.slc.client.hibernate"/>
+      <plugin id="org.argeo.slc.client.oxm"/>
+      <plugin id="org.argeo.slc.client.rcp"/>
+      <plugin id="org.argeo.slc.client.ui"/>
+      <plugin id="org.argeo.slc.client.ui.dist"/>
+      <plugin id="org.argeo.slc.core"/>
+      <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
+      <plugin id="org.argeo.slc.demo.ant"/>
+      <plugin id="org.argeo.slc.demo.basic"/>
+      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
+      <plugin id="org.argeo.slc.detached"/>
+      <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
+      <plugin id="org.argeo.slc.gis.ext.dbcp" fragment="true"/>
+      <plugin id="org.argeo.slc.gis.position.backend"/>
+      <plugin id="org.argeo.slc.gis.position.gpsbabel"/>
+      <plugin id="org.argeo.slc.repo"/>
+      <plugin id="org.argeo.slc.server"/>
+      <plugin id="org.argeo.slc.server.castor"/>
+      <plugin id="org.argeo.slc.server.h2"/>
+      <plugin id="org.argeo.slc.server.hibernate"/>
+      <plugin id="org.argeo.slc.server.jackrabbit.pgsql"/>
+      <plugin id="org.argeo.slc.server.repo"/>
+      <plugin id="org.argeo.slc.server.services"/>
+      <plugin id="org.argeo.slc.specs"/>
+      <plugin id="org.argeo.slc.support.activemq"/>
+      <plugin id="org.argeo.slc.support.aether"/>
+      <plugin id="org.argeo.slc.support.ant"/>
+      <plugin id="org.argeo.slc.support.castor" fragment="true"/>
+      <plugin id="org.argeo.slc.support.gis"/>
+      <plugin id="org.argeo.slc.support.hibernate" fragment="true"/>
+      <plugin id="org.argeo.slc.support.maven"/>
+      <plugin id="org.argeo.slc.support.osgi"/>
+      <plugin id="org.argeo.slc.support.simple"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.springframework.aop"/>
+      <plugin id="org.springframework.beans"/>
+      <plugin id="org.springframework.context"/>
+      <plugin id="org.springframework.context.support"/>
+      <plugin id="org.springframework.core"/>
+      <plugin id="org.springframework.jdbc"/>
+      <plugin id="org.springframework.jms"/>
+      <plugin id="org.springframework.orm"/>
+      <plugin id="org.springframework.osgi.core"/>
+      <plugin id="org.springframework.osgi.extender"/>
+      <plugin id="org.springframework.osgi.io"/>
+      <plugin id="org.springframework.oxm"/>
+      <plugin id="org.springframework.security.acls" fragment="true"/>
+      <plugin id="org.springframework.security.core"/>
+      <plugin id="org.springframework.transaction"/>
+      <plugin id="org.springframework.web"/>
+      <plugin id="org.springframework.web.servlet"/>
+      <plugin id="org.springframework.xml"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.argeo.security.equinox" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.commons" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.core" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.rcp" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.demo.ant" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.gis.position.backend" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.gis.position.gpsbabel" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.jackrabbit.pgsql" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
+      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
+   </configurations>
+
+</product>

diff --git a/eclipse/plugins/org.argeo.slc.client.gis/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.gis/META-INF/MANIFEST.MF
index 22af31e55cce980bb80cd2442e86f5bddd906953..31e52742758b5e8b372c8c12d1c8d1e6aaf35908 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.gis/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.gis/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.vividsolutions.jts.geom;version="1.10.0",
  org.apache.commons.logging;version="1.1.1",
  org.argeo.eclipse.spring,
- org.argeo.slc.geotools;version="0.13.0.SNAPSHOT-r3817",
+ org.argeo.slc.geotools,
  org.argeo.slc.geotools.data,
- org.argeo.slc.geotools.swing;version="0.13.0.SNAPSHOT-r3817",
- org.argeo.slc.gis.model;version="0.13.0.SNAPSHOT-r3817",
- org.argeo.slc.jts;version="0.13.0.SNAPSHOT-r3817",
+ org.argeo.slc.geotools.swing,
+ org.argeo.slc.gis.model,
+ org.argeo.slc.jts,
  org.geotools.data,
  org.geotools.gce.image,
  org.geotools.geometry,

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
index d1f0db5b2426aafb19e70330725a10a4e7a3493d..29d4774b80454200452c662d4c33016ea03df611 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
@@ -13,6 +13,8 @@ Import-Package: aQute.lib.osgi;resolution:=optional,
  org.apache.commons.logging;version="1.1.1",
  org.argeo.eclipse.spring,
  org.argeo.eclipse.ui,
+ org.argeo.eclipse.ui.jcr.commands,
+ org.argeo.eclipse.ui.jcr.editors,
  org.argeo.eclipse.ui.jcr.views,
  org.argeo.jcr
 Bundle-ActivationPolicy: lazy

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
new file mode 100644 (file)
index 0000000..aa006e8
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+       <bean id="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor"
+               class="org.argeo.eclipse.ui.jcr.commands.OpenGenericJcrQueryEditor"
+               scope="prototype">
+               <property name="editorId"
+                       value="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" />
+       </bean>
+</beans>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
new file mode 100644 (file)
index 0000000..3f97af1
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
+       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="org.argeo.slc.client.ui.dist.genericJcrQueryEditor"
+               class="org.argeo.eclipse.ui.jcr.editors.GenericJcrQueryEditor" scope="prototype">
+               <property name="session" ref="jcrSession" />
+       </bean>
+</beans>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/plugin.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/plugin.xml
index 1cb3bae63159776a45d298578803971d6fb71080..902c781255b82dae42e881d0a91361fcb5a4dd35 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -23,4 +23,43 @@
                 name="Distribution">
           </view>
    </extension>
+   <extension
+           point="org.eclipse.ui.editors">
+            <editor
+                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
+              id="org.argeo.slc.client.ui.dist.genericJcrQueryEditor"
+              name="JCR Query"
+              icon="icons/distribution_perspective.gif"
+              default="false">
+        </editor>
+     </extension>
+       <extension
+         point="org.eclipse.ui.commands">
+               <command
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            id="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor"
+            name="OpenGenericJcrQueryEditor ">
+       </command>
+    </extension>
+       <extension
+         id="menu:org.eclipse.ui.main.menu"
+         point="org.eclipse.ui.menus">
+        <!-- Queries --> 
+               <menuContribution
+                allPopups="false"
+                locationURI="menu:org.eclipse.ui.main.menu?after=edit">
+               <menu label="Queries"
+              mnemonic="Queries"
+              id="com.agfa.sebi.ui.queryMenu">
+                <command
+                      commandId="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor"
+                      disabledIcon="icons/saveDisabled.gif"
+                      icon="icons/results.gif"
+                      label="JCR Query"
+                      style="push"
+                      tooltip="Open JCR query editor">
+                </command>
+             </menu>
+          </menuContribution>
+       </extension>
 </plugin>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
index 937e35ddfff0b551eaa34b6f16348ad6a5c97f61..1c5f5ded964a5123319da8ae8a19aaf62b02ad0e 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
@@ -25,6 +25,11 @@
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.ui.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
 
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
index 92337995f013fe87600e52f5152924c05b8cc992..bdcfd890dba458986ccf7f417994078ca7cae726 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
@@ -8,11 +8,11 @@ public class DistributionPerspective implements IPerspectiveFactory {
 
        public void createInitialLayout(IPageLayout layout) {
                String editorArea = layout.getEditorArea();
-               layout.setEditorAreaVisible(false);
+               layout.setEditorAreaVisible(true);
                layout.setFixed(false);
 
-               IFolderLayout main = layout.createFolder("main", IPageLayout.RIGHT,
-                               0.3f, editorArea);
+               IFolderLayout main = layout.createFolder("main", IPageLayout.LEFT,
+                               0.5f, editorArea);
                main.addView("org.argeo.slc.client.ui.dist.distributionView");
                main.addView("org.argeo.slc.client.ui.dist.modulesView");
 

diff --git a/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF b/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
index 8b6d4a9aa96d6f31cd9c27e6be62316ba7efdd2e..bec6866c3ae917bd99cc62b5e5d3da475a6a6b11 100644 (file)
--- a/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
+++ b/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Ui
 Bundle-SymbolicName: org.argeo.slc.gis.position.backend
 Bundle-Version: 1.0.0.qualifier
-Import-Package: org.apache.commons.dbcp;version="1.2.2.osgi",
- org.argeo.slc.core.deploy;version="0.12.2.SNAPSHOT-r3503",
- org.argeo.slc.geotools;version="0.12.2.SNAPSHOT-r3562",
+Import-Package: org.apache.commons.dbcp,
+ org.argeo.slc.core.deploy,
+ org.argeo.slc.geotools,
  org.argeo.slc.geotools.data,
- org.argeo.slc.geotools.swing;version="0.12.2.SNAPSHOT-r3565",
+ org.argeo.slc.geotools.swing,
  org.argeo.slc.gis.field,
- org.argeo.slc.jts;version="0.12.2.SNAPSHOT-r3562",
+ org.argeo.slc.jts,
  org.geotools.data,
  org.geotools.data.postgis,
  org.geotools.jdbc,
- org.springframework.osgi.util;version="1.2.1"
+ org.springframework.osgi.util

diff --git a/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF b/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
index 15780388c56d1d43c087605b9ca5413fb6039b8d..81274f30d88b1959a45bf2b2d7d20b128daba86f 100644 (file)
--- a/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
+++ b/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: SLC GIS Position GpsBabel
 Bundle-SymbolicName: org.argeo.slc.gis.position.gpsbabel
 Bundle-Version: 1.0.0.qualifier
-Import-Package: org.argeo.slc.gpsbabel;version="0.12.2.SNAPSHOT-r3562",
- org.argeo.slc.jts;version="0.12.2.SNAPSHOT-r3562"
+Import-Package: org.argeo.slc.gpsbabel,
+ org.argeo.slc.jts

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
index a6eb8df50d2eb192140fa77a32cd2f12c5d09205..8d5ff5ae251594fbfed194ac2b9c5923694172a4 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
@@ -477,6 +477,7 @@ public class ImportMavenDependencies implements Runnable {
                        }
                }
                res.add(curr.toString());
+               log.debug(res);
                return res;
        }