modification on Maven architecture

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

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/META-INF/MANIFEST.MF b/eclipse/features/org.argeo.eclipse.dep.rcp/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..5c6ec03
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0\r
+Bundle-Vendor: Argeo\r
+Private-Package: .;version="0.2.2-SNAPSHOT-r20110112_162633"\r
+Bundle-Version: 0.2.2.SNAPSHOT-r20110112_162633\r
+Tool: Bnd-0.0.357\r
+Bundle-Name: Argeo Commons RCP Dependencies\r
+Created-By: 1.6.0_17 (Sun Microsystems Inc.)\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-SymbolicName: org.argeo.eclipse.dep.rcp\r
+\r

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf b/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
new file mode 100644 (file)
index 0000000..571745e
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>features</artifactId>
+               <version>0.2.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+       <name>Argeo Commons RCP Dependencies</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- common dependencies for both RCP and RAP -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <!-- Eclipse -->
+               <dependency>
+                       <groupId>org.eclipse.ui</groupId>
+                       <artifactId>org.eclipse.ui</artifactId>
+               </dependency>
+       </dependencies>
+</project>

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/feature.xml b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/feature.xml
new file mode 100644 (file)
index 0000000..a8e78ea
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/feature.xml
@@ -0,0 +1,47 @@
+<feature id="org.argeo.eclipse.dep.rcp" label="Argeo Commons RCP Dependencies" version="0.2.2.qualifier" provider-name="Argeo">
+  <description url="http://projects.argeo.org/commons/site/0.2/eclipse/features/org.argeo.eclipse.dep.rcp"/>
+  <copyright url="http://www.argeo.org"/>
+  <license url="http://www.apache.org/licenses/LICENSE-2.0.txt">SLC - Software LifeCycle framework
+                          
+Copyright 2010 Mathieu Baudier
+
+Licensed under the Apache License, Version 2.0 (the &amp;quot;License&amp;quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &amp;quot;AS IS&amp;quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</license>
+  <plugin id="com.ibm.icu" version="4.2.1.v20100412" download-size="806401" install-size="806401" unpack="false"/>
+  <plugin id="org.argeo.eclipse.dep.common" version="0.2.2.SNAPSHOT-r20110112_162632" download-size="502" install-size="502" unpack="false"/>
+  <plugin id="org.eclipse.core.commands" version="3.6.0.I20100512-1500" download-size="13401" install-size="13401" unpack="false"/>
+  <plugin id="org.eclipse.core.contenttype" version="3.4.100.v20100505-1235" download-size="11491" install-size="11491" unpack="false"/>
+  <plugin id="org.eclipse.core.databinding" version="1.3.100.I20100601-0800" download-size="24969" install-size="24969" unpack="false"/>
+  <plugin id="org.eclipse.core.databinding.observable" version="1.3.0.I20100601-0800" download-size="33800" install-size="33800" unpack="false"/>
+  <plugin id="org.eclipse.core.databinding.property" version="1.3.0.I20100601-0800" download-size="20959" install-size="20959" unpack="false"/>
+  <plugin id="org.eclipse.core.expressions" version="3.4.200.v20100505" download-size="10873" install-size="10873" unpack="false"/>
+  <plugin id="org.eclipse.core.jobs" version="3.5.0.v20100515" download-size="11354" install-size="11354" unpack="false"/>
+  <plugin id="org.eclipse.core.runtime" version="3.6.0.v20100505" download-size="8866" install-size="8866" unpack="false"/>
+  <plugin id="org.eclipse.equinox.app" version="1.3.1.R36x_v20100803" download-size="10479" install-size="10479" unpack="false"/>
+  <plugin id="org.eclipse.equinox.common" version="3.6.0.v20100503" download-size="12744" install-size="12744" unpack="false"/>
+  <plugin id="org.eclipse.equinox.launcher" version="1.1.0.v20100507" download-size="5877" install-size="5877" unpack="false"/>
+  <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" version="1.1.1.R36x_v20100810" download-size="9148" install-size="9148" unpack="false"/>
+  <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" version="1.1.1.R36x_v20100810" download-size="9696" install-size="9696" unpack="false"/>
+  <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" version="1.1.1.R36x_v20100810" download-size="3198" install-size="3198" unpack="false"/>
+  <plugin id="org.eclipse.equinox.preferences" version="3.3.0.v20100503" download-size="13886" install-size="13886" unpack="false"/>
+  <plugin id="org.eclipse.equinox.registry" version="3.5.0.v20100503" download-size="22824" install-size="22824" unpack="false"/>
+  <plugin id="org.eclipse.help" version="3.5.0.v20100524" download-size="32174" install-size="32174" unpack="false"/>
+  <plugin id="org.eclipse.jface" version="3.6.1.M20100825-0800" download-size="133686" install-size="133686" unpack="false"/>
+  <plugin id="org.eclipse.jface.databinding" version="1.4.0.I20100601-0800" download-size="33508" install-size="33508" unpack="false"/>
+  <plugin id="org.eclipse.osgi" version="3.6.0.v20100517" download-size="143402" install-size="143402" unpack="false"/>
+  <plugin id="org.eclipse.swt" version="3.6.1.v3655c" download-size="2165" install-size="2165" unpack="false"/>
+  <plugin id="org.eclipse.swt.gtk.linux.x86" version="3.6.1.v3655c" download-size="281729" install-size="281729" unpack="false"/>
+  <plugin id="org.eclipse.swt.gtk.linux.x86_64" version="3.6.1.v3655c" download-size="304155" install-size="304155" unpack="false"/>
+  <plugin id="org.eclipse.swt.win32.win32.x86" version="3.6.1.v3655c" download-size="304203" install-size="304203" unpack="false"/>
+  <plugin id="org.eclipse.ui" version="3.6.1.M20100826-1330" download-size="19100" install-size="19100" unpack="false"/>
+  <plugin id="org.eclipse.ui.workbench" version="3.6.1.M20100826-1330" download-size="516657" install-size="516657" unpack="false"/>
+</feature>
\ No newline at end of file

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/modularDistribution.csv b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/modularDistribution.csv
new file mode 100644 (file)
index 0000000..a143c1e
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/modularDistribution.csv
@@ -0,0 +1,28 @@
+com.ibm.icu,4.2.1.v20100412,com/ibm/icu/com.ibm.icu/4.2.1/com.ibm.icu-4.2.1.jar
+org.argeo.eclipse.dep.common,0.2.2.SNAPSHOT-r20110112_162632,org/argeo/commons/eclipse/org.argeo.eclipse.dep.common/0.2.2-SNAPSHOT/org.argeo.eclipse.dep.common-0.2.2-SNAPSHOT.jar
+org.eclipse.core.commands,3.6.0.I20100512-1500,org/eclipse/core/org.eclipse.core.commands/3.6.0/org.eclipse.core.commands-3.6.0.jar
+org.eclipse.core.contenttype,3.4.100.v20100505-1235,org/eclipse/core/org.eclipse.core.contenttype/3.4.100.v20100505-1235/org.eclipse.core.contenttype-3.4.100.v20100505-1235.jar
+org.eclipse.core.databinding,1.3.100.I20100601-0800,org/eclipse/core/org.eclipse.core.databinding/1.3.100/org.eclipse.core.databinding-1.3.100.jar
+org.eclipse.core.databinding.observable,1.3.0.I20100601-0800,org/eclipse/core/org.eclipse.core.databinding.observable/1.3.0/org.eclipse.core.databinding.observable-1.3.0.jar
+org.eclipse.core.databinding.property,1.3.0.I20100601-0800,org/eclipse/core/org.eclipse.core.databinding.property/1.3.0/org.eclipse.core.databinding.property-1.3.0.jar
+org.eclipse.core.expressions,3.4.200.v20100505,org/eclipse/core/org.eclipse.core.expressions/3.4.200.v20100505/org.eclipse.core.expressions-3.4.200.v20100505.jar
+org.eclipse.core.jobs,3.5.0.v20100515,org/eclipse/core/org.eclipse.core.jobs/3.5.0.v20100515/org.eclipse.core.jobs-3.5.0.v20100515.jar
+org.eclipse.core.runtime,3.6.0.v20100505,org/eclipse/core/org.eclipse.core.runtime/3.6.0/org.eclipse.core.runtime-3.6.0.jar
+org.eclipse.equinox.app,1.3.1.R36x_v20100803,org/eclipse/equinox/org.eclipse.equinox.app/1.3.1/org.eclipse.equinox.app-1.3.1.jar
+org.eclipse.equinox.common,3.6.0.v20100503,org/eclipse/equinox/org.eclipse.equinox.common/3.6.0.v20100503/org.eclipse.equinox.common-3.6.0.v20100503.jar
+org.eclipse.equinox.launcher,1.1.0.v20100507,org/eclipse/equinox/org.eclipse.equinox.launcher/1.1.0/org.eclipse.equinox.launcher-1.1.0.jar
+org.eclipse.equinox.launcher.gtk.linux.x86,1.1.1.R36x_v20100810,org/eclipse/equinox/org.eclipse.equinox.launcher.gtk.linux.x86/1.1.1/org.eclipse.equinox.launcher.gtk.linux.x86-1.1.1.jar
+org.eclipse.equinox.launcher.gtk.linux.x86_64,1.1.1.R36x_v20100810,org/eclipse/equinox/org.eclipse.equinox.launcher.gtk.linux.x86_64/1.1.1/org.eclipse.equinox.launcher.gtk.linux.x86_64-1.1.1.jar
+org.eclipse.equinox.launcher.win32.win32.x86,1.1.1.R36x_v20100810,org/eclipse/equinox/org.eclipse.equinox.launcher.win32.win32.x86/1.1.1/org.eclipse.equinox.launcher.win32.win32.x86-1.1.1.jar
+org.eclipse.equinox.preferences,3.3.0.v20100503,org/eclipse/equinox/org.eclipse.equinox.preferences/3.3.0/org.eclipse.equinox.preferences-3.3.0.jar
+org.eclipse.equinox.registry,3.5.0.v20100503,org/eclipse/equinox/org.eclipse.equinox.registry/3.5.0.v20100503/org.eclipse.equinox.registry-3.5.0.v20100503.jar
+org.eclipse.help,3.5.0.v20100524,org/eclipse/help/org.eclipse.help/3.5.0/org.eclipse.help-3.5.0.jar
+org.eclipse.jface,3.6.1.M20100825-0800,org/eclipse/jface/org.eclipse.jface/3.6.1/org.eclipse.jface-3.6.1.jar
+org.eclipse.jface.databinding,1.4.0.I20100601-0800,org/eclipse/jface/org.eclipse.jface.databinding/1.4.0/org.eclipse.jface.databinding-1.4.0.jar
+org.eclipse.osgi,3.6.0.v20100517,org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.jar
+org.eclipse.swt,3.6.1.v3655c,org/eclipse/swt/org.eclipse.swt/3.6.1/org.eclipse.swt-3.6.1.jar
+org.eclipse.swt.gtk.linux.x86,3.6.1.v3655c,org/eclipse/swt/org.eclipse.swt.gtk.linux.x86/3.6.1/org.eclipse.swt.gtk.linux.x86-3.6.1.jar
+org.eclipse.swt.gtk.linux.x86_64,3.6.1.v3655c,org/eclipse/swt/org.eclipse.swt.gtk.linux.x86_64/3.6.1/org.eclipse.swt.gtk.linux.x86_64-3.6.1.jar
+org.eclipse.swt.win32.win32.x86,3.6.1.v3655c,org/eclipse/swt/org.eclipse.swt.win32.win32.x86/3.6.1/org.eclipse.swt.win32.win32.x86-3.6.1.jar
+org.eclipse.ui,3.6.1.M20100826-1330,org/eclipse/ui/org.eclipse.ui/3.6.1/org.eclipse.ui-3.6.1.jar
+org.eclipse.ui.workbench,3.6.1.M20100826-1330,org/eclipse/ui/org.eclipse.ui.workbench/3.6.1/org.eclipse.ui.workbench-3.6.1.jar

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/p2.inf b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/target/classes/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/maven-archiver/pom.properties b/eclipse/features/org.argeo.eclipse.dep.rcp/target/maven-archiver/pom.properties
new file mode 100644 (file)
index 0000000..b5e7908
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Jan 12 16:26:34 CET 2011
+version=0.2.2-SNAPSHOT
+groupId=org.argeo.commons.eclipse
+artifactId=org.argeo.eclipse.dep.rcp

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-0.2.2-SNAPSHOT.jar b/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-0.2.2-SNAPSHOT.jar
new file mode 100644 (file)
index 0000000..0b6488f
Binary files /dev/null and b/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-0.2.2-SNAPSHOT.jar differ

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-maven.target b/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-maven.target
new file mode 100644 (file)
index 0000000..e27a679
--- /dev/null
+++ b/eclipse/features/org.argeo.eclipse.dep.rcp/target/org.argeo.eclipse.dep.rcp-maven.target
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.5"?>
+<target name="org.argeo.eclipse.dep.rcp - Local Maven repository (v0.2.2-SNAPSHOT)">
+<locations>
+<location path="/home/bsinou/.m2/repository/com/ibm/icu/com.ibm.icu/4.2.1" type="Directory">
+       <includeBundles><plugin id="com.ibm.icu"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/argeo/commons/eclipse/org.argeo.eclipse.dep.common/0.2.2-SNAPSHOT" type="Directory">
+       <includeBundles><plugin id="org.argeo.eclipse.dep.common"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.commands/3.6.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.commands"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.contenttype/3.4.100.v20100505-1235" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.contenttype"/><plugin id="org.eclipse.core.contenttype.source"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.databinding/1.3.100" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.databinding"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.databinding.observable/1.3.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.databinding.observable"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.databinding.property/1.3.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.databinding.property"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.expressions/3.4.200.v20100505" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.expressions"/><plugin id="org.eclipse.core.expressions.source"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.jobs/3.5.0.v20100515" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.jobs"/><plugin id="org.eclipse.core.jobs.source"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/core/org.eclipse.core.runtime/3.6.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.core.runtime"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.app/1.3.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.app"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.common/3.6.0.v20100503" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.common"/><plugin id="org.eclipse.equinox.common.source"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.launcher/1.1.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.launcher"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.launcher.gtk.linux.x86/1.1.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.launcher.gtk.linux.x86"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.launcher.gtk.linux.x86_64/1.1.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.launcher.win32.win32.x86/1.1.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.preferences/3.3.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.preferences"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.registry/3.5.0.v20100503" type="Directory">
+       <includeBundles><plugin id="org.eclipse.equinox.registry"/><plugin id="org.eclipse.equinox.registry.source"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/help/org.eclipse.help/3.5.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.help"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/jface/org.eclipse.jface/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.jface"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/jface/org.eclipse.jface.databinding/1.4.0" type="Directory">
+       <includeBundles><plugin id="org.eclipse.jface.databinding"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517" type="Directory">
+       <includeBundles><plugin id="org.eclipse.osgi"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/swt/org.eclipse.swt/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.swt"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/swt/org.eclipse.swt.gtk.linux.x86/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.swt.gtk.linux.x86"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/swt/org.eclipse.swt.gtk.linux.x86_64/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.swt.gtk.linux.x86_64"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/swt/org.eclipse.swt.win32.win32.x86/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.swt.win32.win32.x86"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/ui/org.eclipse.ui/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.ui"/></includeBundles>
+</location>
+<location path="/home/bsinou/.m2/repository/org/eclipse/ui/org.eclipse.ui.workbench/3.6.1" type="Directory">
+       <includeBundles><plugin id="org.eclipse.ui.workbench"/></includeBundles>
+</location>
+</locations>
+</target>

diff --git a/eclipse/features/pom.xml b/eclipse/features/pom.xml
new file mode 100644 (file)
index 0000000..8130856
--- /dev/null
+++ b/eclipse/features/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>eclipse</artifactId>
+               <version>0.2.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>features</artifactId>
+       <name>Commons Eclipse Dependencies</name>
+       <packaging>pom</packaging>
+       <modules>
+               <module>org.argeo.eclipse.dep.common</module>
+               <module>org.argeo.eclipse.dep.rcp</module>
+       </modules>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>*.inf</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>buildnumber-maven-plugin</artifactId>
+                               <configuration>
+                                       <useLastCommittedRevision>false</useLastCommittedRevision>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                       </instructions>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-resources</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+               </plugins>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <groupId>org.argeo.maven.plugins</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <executions>
+                                               <execution>
+                                                       <id>generate-descriptors</id>
+                                                       <goals>
+                                                               <goal>descriptors</goal>
+                                                       </goals>
+                                                       <phase>generate-resources</phase>
+                                               </execution>
+                                               <!-- <execution> <id>check-osgi</id> <phase>test</phase> <goals> <goal>equinox</goal> 
+                                                       </goals> <configuration> <onlyCheck>true</onlyCheck> <argsToAppend> <arg>-clean</arg> 
+                                                       </argsToAppend> </configuration> </execution> -->
+                                       </executions>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+       </build>
+</project>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
index 460702ee10a404dcb1a28497448a755595a76649..a40ed57c27526c9d8d1c88bcf5f3b51cce8cf1b0 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
@@ -47,70 +47,26 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- Commons -->
+
+               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
                <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.nodeps</artifactId>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
                        <version>0.2.2-SNAPSHOT</version>
                </dependency>
 
-               <!-- Eclipse -->
+               <!-- RCP only dependency, needed at compile time -->
                <dependency>
                        <groupId>org.eclipse.ui</groupId>
                        <artifactId>org.eclipse.ui</artifactId>
+                       <scope>provided</scope>
                </dependency>
+
+               <!-- Commons -->
                <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.commands</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.preferences</artifactId>
-                       <version>3.3.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.ibm.icu</groupId>
-                       <artifactId>com.ibm.icu</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.nodeps</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
                </dependency>
 
                <!-- Spring -->
@@ -118,7 +74,7 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
-               
+
                <!-- Others -->
                <dependency>
                        <groupId>org.slf4j</groupId>

diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml
index b36c9365b7288d6e12c7859f2ec674593f615eba..dff6c44c7eec94002cccef05a1b7dfdb889cac40 100644 (file)
--- a/eclipse/plugins/pom.xml
+++ b/eclipse/plugins/pom.xml
@@ -1,12 +1,12 @@
-<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.commons</groupId>
+               <groupId>org.argeo.commons.eclipse</groupId>
                <version>0.2.2-SNAPSHOT</version>
                <artifactId>eclipse</artifactId>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.commons.eclipse</groupId>
        <artifactId>plugins</artifactId>
        <name>Commons Eclipse plugins</name>
        <packaging>pom</packaging>

diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index ddfe451518123c7668ab514e619ead9c19136ae3..049f699a0942e57d58dc1f0cabe43e162b9aa22b 100644 (file)
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -7,10 +7,12 @@
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
+       <groupId>org.argeo.commons.eclipse</groupId>
        <artifactId>eclipse</artifactId>
        <name>Commons Eclipse</name>
        <packaging>pom</packaging>
        <modules>
+               <module>features</module>
                <module>plugins</module>
        </modules>
 </project>
\ No newline at end of file