Fix projects dependencies and build strategies after refactoring.

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

diff --git a/dep/org.argeo.security.dep.node.rcp/pom.xml b/dep/org.argeo.security.dep.node.rcp/pom.xml
index 9f8b48de08d4d6b5b6add84ec12fd827f4c3aef2..31c1f0b450ec3302d1de30efb489194e4340c0b6 100644 (file)
--- a/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -54,30 +54,29 @@
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
+
+               <!-- RCP specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.equinox</artifactId>
+                       <artifactId>org.argeo.security.ui.rcp</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.ui</artifactId>
+                       <artifactId>org.argeo.security.equinox</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-
-               <!-- Basis -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.dep.node</artifactId>
+                       <artifactId>org.argeo.security.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
                </dependency>
 
-               <!-- RCP specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.ui.rcp</artifactId>
+                       <artifactId>org.argeo.security.dep.node</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
        </dependencies>
        <profiles>
@@ -140,8 +139,8 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
                                                                                                <includes>
-                                                                                                       <include>org.argeo.commons.base:org.argeo.eclipse.ui.rcp</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.rcp</include>
+                                                                                                       <include>org.argeo.commons:org.argeo.eclipse.ui.rcp</include>
+                                                                                                       <include>org.argeo.commons:org.argeo.security.ui.rcp</include>
                                                                                                </includes>
                                                                                        </dependency>
                                                                                </mapping>

diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index d2795efe6630b946d64d879031e69cd828f142ca..1d083187c07f48db8e331320ec70676202ac42d7 100644 (file)
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -10,25 +10,17 @@
        </parent>
        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
        <name>Commons Eclipse UI RAP</name>
+       <description>Provide rap specific classes and behaviour in order to provide single sourcing abilities</description>
        <packaging>jar</packaging>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
+               <!-- Generic base UI classes. -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
 
-               <!-- Argeo common distribution for RAP projects -->
+               <!-- Base distribution for RAP projects -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -36,5 +28,15 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
+               <!-- Utils and logging -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.util</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
+               </dependency>
+                       <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.eclipse.ui.rcp/bnd.bnd b/org.argeo.eclipse.ui.rcp/bnd.bnd
index 8e43cdfdf6f63ac9da3972cd90ac4907bdfb88b0..4fd32e8c86eab5b2eb580cc1fee77925fa7b1649 100644 (file)
--- a/org.argeo.eclipse.ui.rcp/bnd.bnd
+++ b/org.argeo.eclipse.ui.rcp/bnd.bnd
@@ -1,11 +1,18 @@
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime
-Import-Package: org.springframework.beans.factory,\
-org.springframework.core.io.support,\
-org.apache.commons.io,\
-org.argeo,\
-!org.eclipse.core.runtime,\
-!org.eclipse.core.commands,\
-!org.eclipse.ui.plugin,\
-*
+Require-Bundle: org.eclipse.ui,\
+                               org.eclipse.core.runtime
+Import-Package: org.apache.commons.io,\
+                               org.argeo,\
+                               org.eclipse.core.commands,\
+                               org.eclipse.swt.widgets;version="[0,4.0)",\
+                               org.springframework.beans.factory,\
+                               org.springframework.core.io.support,\
+                               !org.eclipse.core.runtime,\
+                               !org.eclipse.ui.plugin,\
+                               *
+
+
+# Was !org.eclipse.core.commands,\ why ?
+
+#Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin
+#Bundle-ActivationPolicy: lazy
+#Ignore-Package: org.eclipse.core.commands
\ No newline at end of file

diff --git a/org.argeo.eclipse.ui.rcp/pom.xml b/org.argeo.eclipse.ui.rcp/pom.xml
index 8282250c6282d43576b13d3da24c249609710f6a..ed2d761852c02af483caf54a0b9a7aa446f77013 100644 (file)
--- a/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/org.argeo.eclipse.ui.rcp/pom.xml
@@ -10,46 +10,10 @@
        </parent>
        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
        <name>Commons Eclipse UI RCP</name>
+       <description>Provide RCP specific classes and behaviour in order to enable single sourcing</description>
        <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-                                               <Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.ui,org.eclipse.core.runtime</Require-Bundle>
-                                               <Import-Package>
-                                                       org.springframework.beans.factory,
-                                                       org.springframework.core.io.support,
-                                                       org.apache.commons.io,
-                                                       org.argeo,
-                                                       !org.eclipse.core.runtime,
-                                                       !org.eclipse.core.commands,
-                                                       !org.eclipse.ui.plugin,
-                                                       *
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
        <dependencies>
+
                <!-- Argeo Commons for Eclipse (not specific) -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
@@ -57,7 +21,7 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- Argeo Commons third party distribution for RCP projects -->
+               <!-- Base distribution for RCP projects -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
@@ -65,20 +29,16 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
                <!-- Others. -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.commons.io</artifactId>
                </dependency>
-
-               <!-- Logging -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.util</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>slf4j.org.apache.commons.logging</artifactId>

diff --git a/org.argeo.eclipse.ui.workbench/bnd.bnd b/org.argeo.eclipse.ui.workbench/bnd.bnd
index 12e9e59eb97a04ea0cdd01faf8a47ec153687164..cc75c057ef7acc021dd8b2395e8ed74391151abb 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/bnd.bnd
+++ b/org.argeo.eclipse.ui.workbench/bnd.bnd
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,\
 
 Import-Package: org.argeo.eclipse.ui.specific,\
                                org.argeo.eclipse.spring,\
-                               org.osgi.framework,\
+                               org.eclipse.swt.widgets;version="[0,1)",\
+                               org.osgi.framework;version="[1.5,2)",\
                                org.osgi.service.packageadmin,\
                                org.springframework.beans.factory,\
                                org.springframework.core.io.support,\

diff --git a/org.argeo.eclipse.ui.workbench/pom.xml b/org.argeo.eclipse.ui.workbench/pom.xml
index 67451c833482631d15bae0c9a2625532450398c9..c1ebe46cc54fa09ea38fe9a63704878d3c589551 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/pom.xml
+++ b/org.argeo.eclipse.ui.workbench/pom.xml
@@ -9,38 +9,26 @@
        </parent>
        <artifactId>org.argeo.eclipse.ui.workbench</artifactId>
        <name>Commons Eclipse UI Workbench</name>
-<!--   <build> -->
-<!--           <plugins> -->
-<!--                   <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> -->
-<!--                                           <Bundle-Activator>org.argeo.osgi.ui.explorer.OsgiExplorerPlugin</Bundle-Activator> -->
-<!--                                           <Require-Bundle>org.eclipse.ui;resolution:=optional, -->
-<!--                                                   org.eclipse.rap.ui;resolution:=optional, -->
-<!--                                                   org.eclipse.core.runtime</Require-Bundle> -->
-<!--                                           <Export-Package>org.argeo.osgi.ui.explorer.*</Export-Package> -->
-<!--                                   </instructions> -->
-<!--                           </configuration> -->
-<!--                   </plugin> -->
-<!--           </plugins> -->
-<!--   </build> -->
        <dependencies>
-
                <!-- Generic Eclipse UI Dependencies -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
+                       <exclusions>
+                               <!-- version of the org.osgi.framework package provided in this bundle 
+                                       is too old -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp</groupId>
+                                       <artifactId>org.osgi.core</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
-               <!-- RCP only dependency, needed at compile time -->
+               <!-- We build against RAP -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
@@ -53,23 +41,11 @@
                        <scope>provided</scope>
                </dependency>
 
-
                <!-- Business dependencies -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.util</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-
-               <!-- <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.dep.rap</artifactId> 
-                       <type>pom</type> <version>2.1.12-SNAPSHOT</version> <scope>provided</scope> 
-                       </dependency> <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.ui.rcp</artifactId> 
-                       <version>2.1.12-SNAPSHOT</version> <scope>provided</scope> </dependency> -->
        </dependencies>
 </project>

diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java
index 8cd08d96e2ea8b038df5e7d25d48ae1c119f964a..710df928ffd271e6bc1f2df51b38a497d264e70f 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java
+++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java
@@ -19,7 +19,7 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.Workspace;
+// import javax.jcr.Workspace;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.TreeParent;

diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
index ca32da0d839b99056c2a0ffb092f00ce6292833a..0734ef56d0ddb9883c10c5ccdc955d4058cbd057 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
+++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
@@ -108,9 +108,10 @@ public class BundlesView extends ViewPart {
 
                        public String getText(Object element) {
 
-                               return "";
+                               // return "";
                                // FIXME triggers compilation failure
-                               // return ((Bundle) element).getVersion().toString();
+                               Bundle bundle = (org.osgi.framework.Bundle) element;
+                               return bundle.getVersion().toString();
                        }
                });
                new ColumnViewerComparator<Bundle>(column, new Comparator<Bundle>() {

diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.eclipse.ui/bnd.bnd
index 41f9266c98af465edd034ddcca2bb743cd1611a4..ca6aaf028448a0eae12f65a13b8e17408377d0c2 100644 (file)
--- a/org.argeo.eclipse.ui/bnd.bnd
+++ b/org.argeo.eclipse.ui/bnd.bnd
@@ -1,9 +1,15 @@
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin 
-Require-Bundle: org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime
+#Bundle-SymbolicName: org.argeo.eclipse.ui;singleton:=true
+#Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin 
+Require-Bundle: org.eclipse.ui;resolution:=optional,\
+                               org.eclipse.rap.ui;resolution:=optional,\
+                               org.eclipse.core.runtime
 Import-Package: org.springframework.beans.factory,\
-org.springframework.core.io.support,\
-!org.eclipse.core.runtime,\
-!org.eclipse.core.commands,\
-!org.eclipse.ui.plugin,\
-*
+                               org.springframework.core.io.support,\
+                               org.eclipse.swt.widgets;version="[0,1)",\
+                               org.osgi.framework;version="[1.5,2)",\
+                               org.osgi.util.tracker;version="[1.4,2)",\
+                               !org.eclipse.core.runtime,\
+                               !org.eclipse.core.commands,\
+                               !org.eclipse.ui.plugin,\
+                               *

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index e79f62e1c6127a9682c1ad64b9474c2b40f7fc73..b831bf204f0e4b004510da20c4211c62e24b0804 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -25,14 +25,7 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- JCR -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-               </dependency>
-
-               <!-- RCP only dependency, needed at compile time -->
+               <!-- We build against RAP -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -48,16 +41,25 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- Spring -->
+               <!-- JCR -->
                <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.springframework.context</artifactId>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.server.jcr</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
+
+               <!--  Bridge Spring and OSGi -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
+               <!-- Spring -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.context</artifactId>
+               </dependency>
+
                <!-- Others -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>

diff --git a/org.argeo.security.ui.admin/bnd.bnd b/org.argeo.security.ui.admin/bnd.bnd
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8bfac3a9a36d564dd3ab944edf18fa3567fdbb20 100644 (file)
--- a/org.argeo.security.ui.admin/bnd.bnd
+++ b/org.argeo.security.ui.admin/bnd.bnd
@@ -0,0 +1,20 @@
+Bundle-SymbolicName: org.argeo.security.ui.admin;singleton:=true
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.argeo.security.ui.admin.SecurityAdminPlugin
+Require-Bundle:        org.eclipse.core.runtime
+Import-Package:        *,\
+                               org.eclipse.core.runtime.jobs,\
+                               org.argeo.eclipse.spring,\
+                               org.eclipse.jface.window,\
+                               org.eclipse.swt,\
+                               org.eclipse.ui.services,\
+                               org.springframework.dao,\
+                               org.eclipse.swt.widgets;version="[0,1)",\
+                               org.springframework.core
+Export-Packages:       org.argeo.security.ui.admin.*
+
+# FIXME Import issue: target plateform and imports are not OK for security.dep.node.rcp
+# org.eclipse.core.runtime.jobs;version="[3.2,4)",\
+# Useless this bundle?
+# org.eclipse.ui;resolution:=optional,\
+# org.eclipse.rap.ui;resolution:=optional

diff --git a/org.argeo.security.ui.admin/pom.xml b/org.argeo.security.ui.admin/pom.xml
index 48ce910175a3d2a7ee86e81240b2a7a4e4f2c94f..e96324d292441b848b04e5c4a0ecae1d560a0174 100644 (file)
--- a/org.argeo.security.ui.admin/pom.xml
+++ b/org.argeo.security.ui.admin/pom.xml
@@ -11,44 +11,6 @@
        <artifactId>org.argeo.security.ui.admin</artifactId>
        <name>Commons Security Admin UI</name>
        <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </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>
-                                               <Bundle-Activator>org.argeo.security.ui.admin.SecurityAdminPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
-                                               <Import-Package>
-                                                       *,
-                                                       org.eclipse.swt,
-                                                       org.eclipse.ui.services,
-                                                       org.eclipse.jface.window,
-                                                       org.argeo.eclipse.spring,
-                                                       org.springframework.dao,
-                                                       org.springframework.core,
-                                               </Import-Package>
-                                               <Export-Package>org.argeo.security.ui.admin.*</Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
        <dependencies>
                <!-- Argeo Security -->
                <dependency>
@@ -56,14 +18,26 @@
                        <artifactId>org.argeo.security.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.security.core</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- Argeo Eclipse -->
+               <!-- Argeo Eclipse, we build agaist RAP -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+                       <type>pom</type>
+                       <version>2.1.12-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
@@ -89,20 +63,5 @@
                        <artifactId>slf4j.org.apache.commons.logging
                        </artifactId>
                </dependency>
-
-               <!-- RAP only dependency, needed at compile time -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-                       <type>pom</type>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <scope>provided</scope>
-               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index ebc08319e797e3475dbfaef09b348d3b0336d218..990c4ac82f1bd26d5d0e36d8e1e7ec5091d62920 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -56,8 +56,13 @@ public class ArgeoUserEditor extends FormEditor {
                userProfile = UserJcrUtils.getUserProfile(session, username);
 
                if (userAdminService.userExists(username)) {
-                       userDetails = (JcrUserDetails) userAdminService
-                                       .loadUserByUsername(username);
+                       try {
+                               userDetails = (JcrUserDetails) userAdminService
+                                               .loadUserByUsername(username);
+                       } catch (Exception e) {
+                               throw new ArgeoException("Cannot retrieve userDetails for "
+                                               + username, e);
+                       }
                } else {
                        GrantedAuthority[] authorities = {};
                        try {
@@ -142,12 +147,12 @@ public class ArgeoUserEditor extends FormEditor {
                JcrUtils.logoutQuietly(session);
                super.dispose();
        }
-       
+
        /* DEPENDENCY INJECTION */
        public void setUserAdminService(UserAdminService userAdminService) {
                this.userAdminService = userAdminService;
        }
-       
+
        public void setRepository(Repository repository) {
                try {
                        session = repository.login();

diff --git a/org.argeo.security.ui/bnd.bnd b/org.argeo.security.ui/bnd.bnd
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..176c72a718e6fa5a746ccdd7761eebea218271bf 100644 (file)
--- a/org.argeo.security.ui/bnd.bnd
+++ b/org.argeo.security.ui/bnd.bnd
@@ -0,0 +1,15 @@
+Bundle-SymbolicName: org.argeo.security.ui;singleton:=true
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin
+
+Require-Bundle: org.eclipse.ui;resolution:=optional,\
+                               org.eclipse.core.runtime,\
+                               org.eclipse.rap.ui;resolution:=optional
+
+Import-Package: org.argeo.eclipse.spring,\
+                               org.apache.log4j;resolution:=optional,\
+                               org.eclipse.swt.widgets;version="[0,4.0)",\
+                               *
+                               
+Export-Packages:       !org.argeo.security.ui.internal.*,\
+                                       org.argeo.security.ui.* 

diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml
index 11feae9d9d7b7e004d60d96edf273fdbb18bf09c..848fc26c1b96532209c90c368c8ad7e011271cdb 100644 (file)
--- a/org.argeo.security.ui/pom.xml
+++ b/org.argeo.security.ui/pom.xml
@@ -11,43 +11,6 @@
        <artifactId>org.argeo.security.ui</artifactId>
        <name>Commons Security UI</name>
        <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </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>
-                                               <Bundle-Activator>org.argeo.security.ui.SecurityUiPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
-                                               <Import-Package>
-                                                       org.argeo.eclipse.spring,
-                                                       org.apache.log4j;resolution:=optional,
-                                                       *
-                                               </Import-Package>
-                                               <Export-Package>
-                                                       !org.argeo.security.ui.internal.*,
-                                                       org.argeo.security.ui.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
        <dependencies>
                <!-- Argeo Security -->
                <dependency>
@@ -56,14 +19,14 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- Argeo Eclipse -->
+               <!-- Generic Eclipse Utilities -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- RAP only dependency, needed at compile time -->
+               <!-- We build against RAP -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -72,24 +35,19 @@
                        <scope>provided</scope>
                </dependency>
 
-               <!-- Commons -->
+               <!-- Others: Commons utils, Spring, Logging -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.util</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-
-               <!-- Spring -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
-
-               <!-- Others -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index a4df50190e0322f3a014455b5059a9c728c7bb9e..a5b11d142f7ccf933a3186cf323f90e6336918ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,6 @@
                <module>org.argeo.cms</module>
                <!-- Standard Workbench Perspectives -->
                <module>org.argeo.eclipse.ui.workbench</module>
-               <!-- <module>org.argeo.osgi.ui.explorer</module> <module>org.argeo.jcr.ui.explorer</module> -->
                <module>org.argeo.security.equinox</module>
                <module>org.argeo.security.ui</module>
                <module>org.argeo.security.ui.admin</module>