Merge remote-tracking branch 'origin/unstable' into testing

Conflicts:
	sdk/output-cms-rap.target
	sdk/output-cms-rcp.target

diff --cc sdk/output-cms-rap.target
index 980d3c21e3bd1cfb6870c0294db6c1dba2778835,820cb3267b42b4a966f0fd7d93464b57ff22da68..b6f30363cf53921b1c9da171c11a93a1f4a74295
--- 1/sdk/output-cms-rap.target
--- 2/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@@ -2,14 -2,17 +2,17 @@@
  <?pde version="3.8"?>
  <target name="(output) CMS RAP">
        <locations>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
        </locations>
  </target>

diff --cc sdk/output-cms-rcp.target
index d7407535c8cbf889bd2c73462d96f796b5b3add8,ce7bc50992f1ff681f2770ad09f09ef7f4d2bbfd..9e818714e9a327e8bddfc3ff993e272f0143e7b4
--- 1/sdk/output-cms-rcp.target
--- 2/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@@ -2,14 -2,17 +2,17 @@@
  <?pde version="3.8"?>
  <target name="(output) CMS RCP">
        <locations>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -              <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++              <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
        </locations>
  </target>