Generate MANIFESTs

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

diff --git a/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
index 9a926880cf8a012756344914235b22a0a4d3d01f..02580bc6137c5a19d8a75c1b5f0ad5507698344e 100644 (file)
--- a/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
@@ -1,13 +1,23 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rap Client for SLC
-Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true
-Bundle-Version: 1.1.3.SNAPSHOT
-Bundle-Vendor: Argeo SASU
-Require-Bundle: org.eclipse.rap.ui;resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.servlet;version="2.4.0",
- javax.servlet.http;version="2.4.0",
- org.argeo.security.ui.rap
-Export-Package: org.argeo.slc.client.rap
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1342538784010\r
+Build-Jdk: 1.6.0_24\r
+Built-By: mbaudier\r
+Bundle-ActivationPolicy: lazy\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Client RAP\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 1.1.3.SNAPSHOT-r120717_1726\r
+Created-By: Apache Maven Bundle Plugin\r
+Export-Package: org.argeo.slc.client.rap;uses:="org.argeo.security.ui.ra\r
+ p";version="1.1.3.SNAPSHOT-r120717_1726"\r
+Import-Package: javax.servlet;version="[2.5,3)",javax.servlet.http;versi\r
+ on="[2.5,3)",org.argeo.security.ui.rap;version="[1.1,2)"\r
+Require-Bundle: org.eclipse.rap.ui;resolution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/plugins/org.argeo.slc.client.rap/pom.xml b/plugins/org.argeo.slc.client.rap/pom.xml
index dcc7bde91deaf416f70748dcf1a621e632515dbd..f8c7cb7fc78544598eea2cb90b7307219e54f868 100644 (file)
--- a/plugins/org.argeo.slc.client.rap/pom.xml
+++ b/plugins/org.argeo.slc.client.rap/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -9,6 +10,24 @@
        <artifactId>org.argeo.slc.client.rap</artifactId>
        <name>SLC Client RAP</name>
        <packaging>jar</packaging>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Require-Bundle>org.eclipse.rap.ui;resolution:=optional</Require-Bundle>
+                                               <Import-Package>
+                                                       *,
+                                                       javax.servlet,
+                                                       javax.servlet.http
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
        <dependencies>
 
                <!-- SLC -->

diff --git a/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
index 03c71a755e0617afab2eb7b8cf9b0a5630d68216..5617538d52ba55e8fd87265ae6f7f60f6d99c241 100644 (file)
--- a/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
@@ -1,16 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC RCP
-Bundle-SymbolicName: org.argeo.slc.client.rcp;singleton:=true
-Bundle-Version: 1.1.3.SNAPSHOT
-Bundle-Activator: org.argeo.slc.client.rcp.ClientRcpPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.argeo.security.ui.rcp,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.execution,
- org.argeo.slc.process,
- org.argeo.slc.runtime,
-Export-Package: org.argeo.slc.client.rcp
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1342538782914\r
+Build-Jdk: 1.6.0_24\r
+Built-By: mbaudier\r
+Bundle-ActivationPolicy: lazy\r
+Bundle-Activator: org.argeo.slc.client.rcp.ClientRcpPlugin\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Client RCP\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.client.rcp;singleton:=true\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 1.1.3.SNAPSHOT-r120717_1726\r
+Created-By: Apache Maven Bundle Plugin\r
+Export-Package: org.argeo.slc.client.rcp;uses:="org.eclipse.jface.resour\r
+ ce,org.eclipse.ui.plugin,org.osgi.framework,org.eclipse.jface.window,or\r
+ g.eclipse.ui.application,org.argeo.security.ui.rcp,org.eclipse.swt.dnd,\r
+ org.eclipse.ui,org.eclipse.swt.widgets,org.eclipse.swt.graphics,org.ecl\r
+ ipse.ui.part";version="1.1.3.SNAPSHOT-r120717_1726"\r
+Import-Package: org.argeo.security.ui.rcp;version="[1.1,2)",org.eclipse.\r
+ jface.resource,org.eclipse.jface.window,org.eclipse.swt.dnd,org.eclipse\r
+ .swt.graphics,org.eclipse.swt.widgets,org.eclipse.ui;ui.workbench=split\r
+ ,org.eclipse.ui.application,org.eclipse.ui.part;ui.workbench=split,org.\r
+ eclipse.ui.plugin,org.osgi.framework;version="[1.3,2)"\r
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime\r
+Tool: Bnd-1.50.0\r

diff --git a/plugins/org.argeo.slc.client.rcp/pom.xml b/plugins/org.argeo.slc.client.rcp/pom.xml
index bbe2e40ca2deaf05ea850504db904f96689f3909..8036c9d46cec1f88255df054e4b149437b227091 100644 (file)
--- a/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -9,6 +10,26 @@
        <artifactId>org.argeo.slc.client.rcp</artifactId>
        <name>SLC Client RCP</name>
        <packaging>jar</packaging>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Activator>org.argeo.slc.client.rcp.ClientRcpPlugin</Bundle-Activator>
+                                               <Require-Bundle>
+                                                       org.eclipse.ui,
+                                                       org.eclipse.core.runtime
+                                               </Require-Bundle>
+                                               <Import-Package>
+                                                       *,
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
        <dependencies>
                <!-- SLC -->
                <dependency>

diff --git a/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
index a5c5b5defbdb2bb0cd3ad8a52bfcbc7d14b4ea21..4f885c4f69f5c6e4c8707526e1eda18ffd123cd2 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
@@ -1,41 +1,90 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Dist
-Bundle-SymbolicName: org.argeo.slc.client.ui.dist;singleton:=true
-Bundle-Version: 1.1.3.SNAPSHOT
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.argeo.slc.client.ui.dist.DistPlugin
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional,
- org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.rap.ui.workbench;resolution:=optional
-Import-Package: aQute.lib.osgi;resolution:=optional,
- javax.jcr;version="[2.0.0,3.0.0)",
- javax.jcr.nodetype;version="2.0.0",
- javax.jcr.query,
- javax.jcr.query.qom;version="2.0.0",
- javax.jcr.security,
- javax.jcr.util;version="2.0.0",
- org.apache.commons.io;version="1.4.0",
- org.apache.commons.logging;version="1.1.1",
- org.argeo,
- org.argeo.eclipse.spring,
- org.argeo.eclipse.ui,
- org.argeo.eclipse.ui.dialogs,
- org.argeo.eclipse.ui.jcr,
- org.argeo.eclipse.ui.jcr.commands,
- org.argeo.eclipse.ui.jcr.editors,
- org.argeo.eclipse.ui.jcr.utils,
- org.argeo.eclipse.ui.jcr.views,
- org.argeo.eclipse.ui.specific,
- org.argeo.eclipse.ui.utils,
- org.argeo.jcr,
- org.argeo.jcr.security,
- org.argeo.jcr.spring,
- org.argeo.slc.jcr,
- org.argeo.slc.repo,
- org.eclipse.ui.forms,
- org.eclipse.ui.forms.editor,
- org.eclipse.ui.forms.events,
- org.eclipse.ui.forms.widgets
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1342538781288\r
+Build-Jdk: 1.6.0_24\r
+Built-By: mbaudier\r
+Bundle-ActivationPolicy: lazy\r
+Bundle-Activator: org.argeo.slc.client.ui.dist.DistPlugin\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Client UI Distribution\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.client.ui.dist;singleton:=true\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 1.1.3.SNAPSHOT-r120717_1726\r
+Created-By: Apache Maven Bundle Plugin\r
+Export-Package: org.argeo.slc.client.ui.dist;uses:="org.eclipse.jface.re\r
+ source,org.eclipse.swt.graphics,org.eclipse.ui.plugin,org.osgi.framewor\r
+ k,org.eclipse.ui";version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.c\r
+ lient.ui.dist.commands;uses:="aQute.lib.osgi,org.eclipse.core.commands,\r
+ org.argeo,javax.jcr,org.apache.commons.logging,org.argeo.slc.client.ui.\r
+ dist,org.eclipse.ui,javax.jcr.nodetype,org.argeo.jcr,org.argeo.slc.clie\r
+ nt.ui.dist.utils,org.eclipse.swt.widgets,org.eclipse.jface.dialogs,org.\r
+ eclipse.jface.viewers,org.eclipse.jface.wizard,org.eclipse.ui.handlers,\r
+ org.argeo.slc.client.ui.dist.wizards,org.eclipse.core.runtime,org.eclip\r
+ se.core.runtime.jobs,org.argeo.slc.repo,javax.jcr.util,org.argeo.slc.jc\r
+ r,org.argeo.slc.client.ui.dist.views,org.eclipse.ui.forms.editor,org.ar\r
+ geo.slc.client.ui.dist.editors,javax.jcr.query,javax.jcr.query.qom,org.\r
+ apache.commons.io,org.eclipse.ui.commands";version="1.1.3.SNAPSHOT-r120\r
+ 717_1726",org.argeo.slc.client.ui.dist.editors;uses:="org.argeo,javax.j\r
+ cr,org.eclipse.jface.viewers,org.argeo.slc.client.ui.dist,org.eclipse.s\r
+ wt.graphics,org.argeo.slc.client.ui.dist.utils,org.argeo.slc.jcr,org.ap\r
+ ache.commons.logging,org.eclipse.ui.forms,org.eclipse.swt.layout,org.ec\r
+ lipse.ui.forms.widgets,org.eclipse.ui.forms.editor,org.eclipse.swt.widg\r
+ ets,org.eclipse.core.runtime,org.eclipse.ui,org.eclipse.jface.resource,\r
+ org.argeo.jcr,org.eclipse.jface.action,org.eclipse.swt.events,org.argeo\r
+ .eclipse.ui,javax.jcr.query,org.eclipse.ui.services,javax.jcr.query.qom\r
+ ";version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.client.ui.dist.pr\r
+ oviders;uses:="org.argeo,javax.jcr,org.argeo.slc.client.ui.dist,org.arg\r
+ eo.jcr,org.eclipse.swt.graphics,org.eclipse.jface.viewers,org.argeo.slc\r
+ .jcr,org.argeo.eclipse.ui.jcr.utils";version="1.1.3.SNAPSHOT-r120717_17\r
+ 26",org.argeo.slc.client.ui.dist.utils;uses:="org.eclipse.swt.events,or\r
+ g.eclipse.jface.viewers,org.eclipse.swt.widgets,org.eclipse.swt.graphic\r
+ s,javax.jcr,org.argeo,javax.jcr.query,org.argeo.eclipse.ui,org.apache.c\r
+ ommons.logging,org.argeo.slc.client.ui.dist,org.argeo.slc.jcr,org.eclip\r
+ se.ui.handlers,org.eclipse.jface.resource,org.eclipse.ui,org.eclipse.ui\r
+ .menus,org.eclipse.core.commands,org.eclipse.ui.commands,org.eclipse.jf\r
+ ace.action,org.eclipse.ui.services,org.argeo.eclipse.ui.jcr.utils,org.a\r
+ rgeo.slc.client.ui.dist.editors,org.argeo.eclipse.ui.specific,org.eclip\r
+ se.jface.dialogs";version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.c\r
+ lient.ui.dist.views;uses:="org.eclipse.jface.viewers,org.eclipse.swt.gr\r
+ aphics,javax.jcr,org.argeo,org.eclipse.core.runtime,org.apache.commons.\r
+ logging,org.eclipse.ui.part,org.argeo.slc.jcr,org.eclipse.swt.layout,ja\r
+ vax.jcr.query,org.argeo.eclipse.ui,org.argeo.slc.client.ui.dist.utils,o\r
+ rg.eclipse.swt.widgets,org.eclipse.jface.dialogs,org.argeo.slc.client.u\r
+ i.dist,org.argeo.jcr,org.argeo.slc.client.ui.dist.providers,org.eclipse\r
+ .ui,org.argeo.slc.repo,org.eclipse.jface.action,org.argeo.slc.client.ui\r
+ .dist.editors,org.eclipse.ui.services,org.osgi.framework,org.osgi.servi\r
+ ce.packageadmin,org.eclipse.swt.custom";version="1.1.3.SNAPSHOT-r120717\r
+ _1726",org.argeo.slc.client.ui.dist.wizards;uses:="javax.jcr,org.argeo,\r
+ org.eclipse.jface.wizard,org.argeo.jcr,org.eclipse.swt.events,org.eclip\r
+ se.swt.widgets,org.eclipse.swt.layout";version="1.1.3.SNAPSHOT-r120717_\r
+ 1726"\r
+Import-Package: aQute.lib.osgi;version="[1.43,2)",javax.jcr;version="[2.\r
+ 0,3)",javax.jcr.nodetype;version="[2.0,3)",javax.jcr.query;version="[2.\r
+ 0,3)",javax.jcr.query.qom;version="[2.0,3)",javax.jcr.security;version=\r
+ "[2.0,3)",javax.jcr.util;version="[2.0,3)",org.apache.commons.io;versio\r
+ n="[1.4,2)",org.apache.commons.logging;version="[1.1,2)",org.argeo;vers\r
+ ion="[1.1,2)",org.argeo.eclipse.spring;version="[1.1,2)",org.argeo.ecli\r
+ pse.ui;version="[1.1,2)",org.argeo.eclipse.ui.jcr.commands;version="[1.\r
+ 1,2)",org.argeo.eclipse.ui.jcr.editors;version="[1.1,2)",org.argeo.ecli\r
+ pse.ui.jcr.utils;version="[1.1,2)",org.argeo.eclipse.ui.specific;versio\r
+ n="[1.1,2)",org.argeo.jcr;version="[1.1,2)",org.argeo.jcr.spring;versio\r
+ n="[1.1,2)",org.argeo.slc.jcr;version="[1.1,2)",org.argeo.slc.repo;vers\r
+ ion="[1.1,2)",org.eclipse.core.commands,org.eclipse.core.runtime;versio\r
+ n="[3.4,4)",org.eclipse.core.runtime.jobs,org.eclipse.jface.action,org.\r
+ eclipse.jface.dialogs,org.eclipse.jface.resource,org.eclipse.jface.view\r
+ ers,org.eclipse.jface.wizard,org.eclipse.swt.custom,org.eclipse.swt.eve\r
+ nts,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.wid\r
+ gets,org.eclipse.ui;ui.workbench=split,org.eclipse.ui.commands,org.ecli\r
+ pse.ui.forms,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.widgets,o\r
+ rg.eclipse.ui.handlers,org.eclipse.ui.menus,org.eclipse.ui.part;ui.work\r
+ bench=split,org.eclipse.ui.plugin,org.eclipse.ui.services,org.osgi.fram\r
+ ework;version="[1.3,2)",org.osgi.service.packageadmin;version="[1.2,2)"\r
+Require-Bundle: org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;r\r
+ esolution:=optional,org.eclipse.core.runtime;resolution:=optional,org.e\r
+ clipse.rap.ui.workbench;resolution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/plugins/org.argeo.slc.client.ui.dist/plugin.xml b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
index 8479ed3781d2f1fed5bc8babec23d24d9ba9ca26..0edb2f87a82da6eb6adbdc909d7c6a38f0974bcd 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -213,7 +213,7 @@
         <activityPatternBinding
               activityId="org.argeo.security.ui.adminActivity"
               isEqualityPattern="true"
-              pattern="org.argeo.slc.client.ui/org.argeo.slc.client.ui.slcExecutionPerspective">
+              pattern="org.argeo.slc.client.ui.dist/org.argeo.slc.client.ui.dist.distributionPerspective">
         </activityPatternBinding>
      </extension>
 </plugin>

diff --git a/plugins/org.argeo.slc.client.ui.dist/pom.xml b/plugins/org.argeo.slc.client.ui.dist/pom.xml
index 5a234bfec81f89234d0b953c736881f74f337117..1b42be7be11cae7aeb5f8489bc348a9bbaecb10e 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/pom.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.slc</groupId>
@@ -9,8 +11,30 @@
        <artifactId>org.argeo.slc.client.ui.dist</artifactId>
        <name>SLC Client UI Distribution</name>
        <packaging>jar</packaging>
-
-
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Activator>org.argeo.slc.client.ui.dist.DistPlugin</Bundle-Activator>
+                                               <Require-Bundle>
+                                                       org.eclipse.ui;resolution:=optional,
+                                                       org.eclipse.rap.ui;resolution:=optional,
+                                                       org.eclipse.core.runtime;resolution:=optional,
+                                                       org.eclipse.rap.ui.workbench;resolution:=optional
+                                               </Require-Bundle>
+                                               <Import-Package>
+                                                       org.argeo.eclipse.spring,
+                                                       javax.jcr.security,
+                                                       *
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
        <dependencies>
                <!-- Commons UI -->
                <dependency>

diff --git a/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
index 07ac629c9ba6754241840765d452ba5051148629..ab661d8b574dfede108e5598b0b8934d99a63be5 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -1,54 +1,69 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ui
-Bundle-SymbolicName: org.argeo.slc.client.ui;singleton:=true
-Bundle-Version: 1.1.3.SNAPSHOT
-Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
-Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional,
- org.eclipse.rap.ui.workbench;resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.argeo.slc.client.ui,
- org.argeo.slc.client.ui.views
-Import-Package: javax.jcr;version="2.0.0",
- javax.jcr.nodetype;version="2.0.0",
- javax.jcr.observation;version="2.0.0",
- javax.jcr.query;version="2.0.0",
- org.apache.commons.io;version="1.4.0",
- org.apache.commons.logging;version="1.1.1",
- org.argeo,
- org.argeo.eclipse.spring,
- org.argeo.eclipse.ui,
- org.argeo.eclipse.ui.jcr,
- org.argeo.eclipse.ui.specific,
- org.argeo.jcr,
- org.argeo.jcr.spring,
- org.argeo.slc,
- org.argeo.slc.build,
- org.argeo.slc.client.ui,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.runtime,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.dao.process,
- org.argeo.slc.dao.test,
- org.argeo.slc.dao.test.tree,
- org.argeo.slc.deploy,
- org.argeo.slc.execution,
- org.argeo.slc.jcr,
- org.argeo.slc.jcr.execution,
- org.argeo.slc.msg.test.tree,
- org.argeo.slc.process,
- org.argeo.slc.runtime,
- org.argeo.slc.test,
- org.eclipse.core.expressions,
- org.eclipse.ui.forms,
- org.eclipse.ui.forms.editor,
- org.eclipse.ui.forms.widgets,
- org.eclipse.ui.plugin,
- org.springframework.beans.factory,
- org.springframework.context,
- org.springframework.core.io.support
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1342538778352\r
+Build-Jdk: 1.6.0_24\r
+Built-By: mbaudier\r
+Bundle-ActivationPolicy: lazy\r
+Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Client UI\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.client.ui;singleton:=true\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 1.1.3.SNAPSHOT-r120717_1726\r
+Created-By: Apache Maven Bundle Plugin\r
+Export-Package: org.argeo.slc.client.ui;uses:="org.eclipse.jface.resourc\r
+ e,org.eclipse.swt.graphics,org.eclipse.ui.plugin,org.osgi.framework,org\r
+ .eclipse.ui";version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.client\r
+ .ui.commands;uses:="org.argeo.slc.execution,org.argeo.slc.process,org.e\r
+ clipse.core.commands,org.argeo.slc,javax.jcr,org.eclipse.core.runtime,o\r
+ rg.apache.commons.logging,org.eclipse.core.runtime.jobs,org.eclipse.jfa\r
+ ce.viewers,org.argeo.slc.deploy,org.eclipse.ui.handlers,org.eclipse.ui"\r
+ ;version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.client.ui.controll\r
+ ers;uses:="javax.jcr,org.apache.commons.logging,org.argeo.slc.execution\r
+ ,org.argeo.slc.runtime,org.argeo.slc,org.argeo.slc.jcr,org.argeo.slc.jc\r
+ r.execution";version="1.1.3.SNAPSHOT-r120717_1726",org.argeo.slc.client\r
+ .ui.editors;uses:="org.eclipse.ui.forms,org.argeo.eclipse.ui.jcr,javax.\r
+ jcr.observation,org.eclipse.swt.widgets,org.eclipse.ui.forms.editor,org\r
+ .eclipse.swt.events,javax.jcr,org.eclipse.jface.viewers,org.argeo.slc,j\r
+ avax.jcr.query,org.eclipse.swt.dnd,org.eclipse.swt.graphics,org.argeo.s\r
+ lc.jcr,org.argeo.slc.client.ui,org.eclipse.ui,org.argeo.slc.core.execut\r
+ ion,org.argeo,org.eclipse.swt.custom,org.eclipse.swt.layout,org.eclipse\r
+ .ui.forms.widgets,org.argeo.jcr,org.eclipse.core.runtime,org.argeo.slc.\r
+ execution,org.argeo.slc.client.ui.controllers,org.argeo.eclipse.ui,org.\r
+ eclipse.jface.resource,javax.jcr.nodetype";version="1.1.3.SNAPSHOT-r120\r
+ 717_1726",org.argeo.slc.client.ui.views;uses:="org.argeo,javax.jcr,org.\r
+ argeo.eclipse.ui.jcr,org.argeo.slc,org.eclipse.core.runtime,org.eclipse\r
+ .core.runtime.jobs,org.argeo.slc.execution,org.eclipse.jface.viewers,ja\r
+ vax.jcr.query,org.argeo.slc.client.ui.editors,org.eclipse.ui,org.eclips\r
+ e.swt.dnd,org.eclipse.swt.graphics,org.argeo.slc.client.ui,org.apache.c\r
+ ommons.logging,javax.jcr.observation,org.eclipse.swt.widgets,org.eclips\r
+ e.ui.part,org.argeo.slc.jcr,org.argeo.eclipse.ui.specific,org.argeo.jcr\r
+ ";version="1.1.3.SNAPSHOT-r120717_1726"\r
+Import-Package: javax.jcr;version="[2.0,3)",javax.jcr.nodetype;version="\r
+ [2.0,3)",javax.jcr.observation;version="[2.0,3)",javax.jcr.query;versio\r
+ n="[2.0,3)",org.apache.commons.logging;version="[1.1,2)",org.argeo;vers\r
+ ion="[1.1,2)",org.argeo.eclipse.spring;version="[1.1,2)",org.argeo.ecli\r
+ pse.ui;version="[1.1,2)",org.argeo.eclipse.ui.jcr;version="[1.1,2)",org\r
+ .argeo.eclipse.ui.specific;version="[1.1,2)",org.argeo.jcr;version="[1.\r
+ 1,2)",org.argeo.jcr.spring;version="[1.1,2)",org.argeo.slc;version="[1.\r
+ 1,2)",org.argeo.slc.core.execution;version="[1.1,2)",org.argeo.slc.depl\r
+ oy;version="[1.1,2)",org.argeo.slc.execution;version="[1.1,2)",org.arge\r
+ o.slc.jcr;version="[1.1,2)",org.argeo.slc.jcr.execution;version="[1.1,2\r
+ )",org.argeo.slc.process;version="[1.1,2)",org.argeo.slc.runtime;versio\r
+ n="[1.1,2)",org.eclipse.core.commands,org.eclipse.core.runtime;version=\r
+ "[3.4,4)",org.eclipse.core.runtime.jobs,org.eclipse.jface.resource,org.\r
+ eclipse.jface.viewers,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.ec\r
+ lipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.ec\r
+ lipse.swt.widgets,org.eclipse.ui;ui.workbench=split,org.eclipse.ui.form\r
+ s,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.widgets,org.eclipse.\r
+ ui.handlers,org.eclipse.ui.part;ui.workbench=split,org.eclipse.ui.plugi\r
+ n,org.osgi.framework;version="[1.3,2)"\r
+Require-Bundle: org.eclipse.ui;resolution:=optional,org.eclipse.core.run\r
+ time;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.e\r
+ clipse.rap.ui.workbench;resolution:=optional\r
+Tool: Bnd-1.50.0\r

diff --git a/plugins/org.argeo.slc.client.ui/pom.xml b/plugins/org.argeo.slc.client.ui/pom.xml
index b87c5587057cd9f2941e2617045e902a0359ffd2..1b4d6b132a30e6a53573fdd43cd389dc05b99e82 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/plugins/org.argeo.slc.client.ui/pom.xml
@@ -1,4 +1,5 @@
-<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.slc</groupId>
@@ -9,21 +10,30 @@
        <artifactId>org.argeo.slc.client.ui</artifactId>
        <name>SLC Client UI</name>
        <packaging>jar</packaging>
-
-
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Activator>org.argeo.slc.client.ui.ClientUiPlugin</Bundle-Activator>
+                                               <Require-Bundle>
+                                                       org.eclipse.ui;resolution:=optional,
+                                                       org.eclipse.core.runtime;resolution:=optional,
+                                                       org.eclipse.rap.ui;resolution:=optional,
+                                                       org.eclipse.rap.ui.workbench;resolution:=optional
+                                               </Require-Bundle>
+                                               <Import-Package>
+                                                       org.argeo.eclipse.spring,
+                                                       *
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
        <dependencies>
-               <!-- SLC Client UI -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.slc</groupId> -->
-               <!-- <artifactId>org.argeo.slc.client.oxm</artifactId> -->
-               <!-- <version>${version.slc}</version> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.slc</groupId> -->
-               <!-- <artifactId>org.argeo.slc.client.core</artifactId> -->
-               <!-- <version>${version.slc}</version> -->
-               <!-- </dependency> -->
-
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
@@ -36,12 +46,6 @@
                        <version>1.1.3-SNAPSHOT</version>
                </dependency>
 
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.slc.runtime</groupId> -->
-<!--                   <artifactId>org.argeo.slc.server</artifactId> -->
-<!--                   <version>1.1.3-SNAPSHOT</version> -->
-<!--           </dependency> -->
-
                <!-- Argeo Eclipse -->
                <dependency>
                        <groupId>org.argeo.commons.base</groupId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
index e214637c14993870710c82a1faa5e04fd98530c4..1336e078f080271c01dae68637fdc670e11f804b 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -27,6 +27,38 @@
                        </resource>
                </resources>
                <plugins>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <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>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                                               <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>