<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>
<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>
</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>
<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
-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
</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>
<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>
<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>
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,\
</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>
<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>
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;
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>() {
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,\
+ *
</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>
<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>
+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
<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>
<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>
<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
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 {
JcrUtils.logoutQuietly(session);
super.dispose();
}
-
+
/* DEPENDENCY INJECTION */
public void setUserAdminService(UserAdminService userAdminService) {
this.userAdminService = userAdminService;
}
-
+
public void setRepository(Repository repository) {
try {
session = repository.login();
+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.*
<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>
<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>
<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
<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>