From 0aa1c816931dfce599fb6855eb216d743c1583b2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 16 Mar 2011 17:06:12 +0000 Subject: [PATCH] Restructure node projects git-svn-id: https://svn.argeo.org/commons/trunk@4297 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.eclipse.dep.common/pom.xml | 8 - .../org.argeo.eclipse.dep.rcp/pom.xml | 18 +- .../dep/org.argeo.security.dep.node/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 13 + ...g.argeo.security.dep.node.rap-maven.target | 708 ++++++++++++++++++ .../org.argeo.security.dep.node.rap/p2.inf | 2 + .../org.argeo.security.dep.node.rap/pom.xml | 60 ++ .../src/assembly/dist.xml | 39 + .../META-INF/MANIFEST.MF | 13 + ...g.argeo.security.dep.node.rcp-maven.target | 688 +++++++++++++++++ .../org.argeo.security.dep.node.rcp/p2.inf | 2 + .../org.argeo.security.dep.node.rcp/pom.xml | 62 ++ .../src/assembly/linux.x86.xml | 42 ++ .../src/assembly/linux.x86_64.xml | 42 ++ .../src/assembly/win32.x86.xml | 42 ++ security/features/pom.xml | 91 +++ .../.classpath | 0 .../.project | 2 +- .../plugins/org.argeo.security.ui.rap/pom.xml | 85 +-- .../org.argeo.security.ui.rcp/.classpath | 7 + .../org.argeo.security.ui.rcp/.project | 28 + .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/jaas_default.txt | 0 .../build.properties | 0 .../icons/alt_about.gif | Bin .../icons/alt_launcher.icns | Bin .../icons/alt_launcher.ico | Bin .../icons/alt_launcher.xpm | 0 .../icons/alt_window_16.gif | Bin .../icons/alt_window_32.gif | Bin .../log4j.properties | 0 .../org.argeo.security.ui.application.product | 0 .../plugin.xml | 6 +- .../plugin_customization.ini | 0 .../pom.xml | 80 +- .../ui/rcp}/AbstractSecureApplication.java | 2 +- .../rcp}/RapSecureWorkbenchWindowAdvisor.java | 2 +- .../ui/rcp}/SecureActionBarAdvisor.java | 2 +- .../ui/rcp}/SecureApplicationActivator.java | 2 +- .../org/argeo/security/ui/rcp}/SecureRap.java | 2 +- .../org/argeo/security/ui/rcp}/SecureRcp.java | 2 +- .../ui/rcp}/SecureWorkbenchAdvisor.java | 2 +- .../ui/rcp}/SecureWorkbenchWindowAdvisor.java | 2 +- security/plugins/pom.xml | 2 +- security/pom.xml | 1 + .../plugins/org.argeo.jcr.ui.explorer/pom.xml | 46 -- server/pom.xml | 1 + 47 files changed, 1910 insertions(+), 196 deletions(-) create mode 100644 security/features/org.argeo.security.dep.node.rap/META-INF/MANIFEST.MF create mode 100644 security/features/org.argeo.security.dep.node.rap/org.argeo.security.dep.node.rap-maven.target create mode 100644 security/features/org.argeo.security.dep.node.rap/p2.inf create mode 100644 security/features/org.argeo.security.dep.node.rap/pom.xml create mode 100644 security/features/org.argeo.security.dep.node.rap/src/assembly/dist.xml create mode 100644 security/features/org.argeo.security.dep.node.rcp/META-INF/MANIFEST.MF create mode 100644 security/features/org.argeo.security.dep.node.rcp/org.argeo.security.dep.node.rcp-maven.target create mode 100644 security/features/org.argeo.security.dep.node.rcp/p2.inf create mode 100644 security/features/org.argeo.security.dep.node.rcp/pom.xml create mode 100644 security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml create mode 100644 security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml create mode 100644 security/features/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml create mode 100644 security/features/pom.xml rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rap}/.classpath (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rap}/.project (92%) create mode 100644 security/plugins/org.argeo.security.ui.rcp/.classpath create mode 100644 security/plugins/org.argeo.security.ui.rcp/.project rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/.settings/org.eclipse.jdt.core.prefs (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/META-INF/jaas_default.txt (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/build.properties (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_about.gif (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_launcher.icns (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_launcher.ico (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_launcher.xpm (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_window_16.gif (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/icons/alt_window_32.gif (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/log4j.properties (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/org.argeo.security.ui.application.product (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/plugin.xml (91%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/plugin_customization.ini (100%) rename security/plugins/{org.argeo.security.ui.application => org.argeo.security.ui.rcp}/pom.xml (60%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/AbstractSecureApplication.java (98%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/RapSecureWorkbenchWindowAdvisor.java (96%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureActionBarAdvisor.java (98%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureApplicationActivator.java (95%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureRap.java (95%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureRcp.java (91%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureWorkbenchAdvisor.java (94%) rename security/plugins/{org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application => org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp}/SecureWorkbenchWindowAdvisor.java (95%) diff --git a/eclipse/features/org.argeo.eclipse.dep.common/pom.xml b/eclipse/features/org.argeo.eclipse.dep.common/pom.xml index 2fd61558b..224012608 100644 --- a/eclipse/features/org.argeo.eclipse.dep.common/pom.xml +++ b/eclipse/features/org.argeo.eclipse.dep.common/pom.xml @@ -10,14 +10,6 @@ org.argeo.eclipse.dep.common Commons Eclipse Shared Dependencies - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml index 645bc9005..b99ee69ca 100644 --- a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml +++ b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml @@ -42,6 +42,10 @@ org.eclipse.swt org.eclipse.swt + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + org.eclipse.swt org.eclipse.swt.gtk.linux.x86_64 @@ -50,19 +54,5 @@ org.eclipse.swt org.eclipse.swt.win32.win32.x86 - - - - - - - - - - - - - - diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml index 008b63214..c68858131 100644 --- a/security/dep/org.argeo.security.dep.node/pom.xml +++ b/security/dep/org.argeo.security.dep.node/pom.xml @@ -8,7 +8,7 @@ .. org.argeo.security.dep.node - Commons Argeo Node Dependencies + Commons Node Dependencies pom diff --git a/security/features/org.argeo.security.dep.node.rap/META-INF/MANIFEST.MF b/security/features/org.argeo.security.dep.node.rap/META-INF/MANIFEST.MF new file mode 100644 index 000000000..0bd96c627 --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rap/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Private-Package: . +Tool: Bnd-1.15.0 +Bundle-Name: Commons Node RAP Dependencies +Created-By: 1.6.0_0 (Sun Microsystems Inc.) +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: Argeo +Bundle-Version: 0.2.3.SNAPSHOT-r20110316_174655 +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-SymbolicName: org.argeo.security.dep.node.rap +Bundle-DocURL: http://www.argeo.org + diff --git a/security/features/org.argeo.security.dep.node.rap/org.argeo.security.dep.node.rap-maven.target b/security/features/org.argeo.security.dep.node.rap/org.argeo.security.dep.node.rap-maven.target new file mode 100644 index 000000000..53b9b9e1b --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rap/org.argeo.security.dep.node.rap-maven.target @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/security/features/org.argeo.security.dep.node.rap/p2.inf b/security/features/org.argeo.security.dep.node.rap/p2.inf new file mode 100644 index 000000000..0423aa509 --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rap/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/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml new file mode 100644 index 000000000..32201f7dc --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rap/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + + org.argeo.commons.security + 0.2.3-SNAPSHOT + features + .. + + org.argeo.security.dep.node.rap + Commons Node RAP Dependencies + jar + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + + + + + + + + + + + + + + + + + + + + + + + org.argeo.commons.server + org.argeo.jcr.ui.explorer + ${version.argeo-commons} + + + + + org.argeo.commons.security + org.argeo.security.dep.node + ${version.argeo-commons} + pom + + + org.argeo.commons.security + org.argeo.security.ui.rap + ${version.argeo-commons} + + + diff --git a/security/features/org.argeo.security.dep.node.rap/src/assembly/dist.xml b/security/features/org.argeo.security.dep.node.rap/src/assembly/dist.xml new file mode 100644 index 000000000..8ed8536bc --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rap/src/assembly/dist.xml @@ -0,0 +1,39 @@ + + + + dist + argeo-node-server + + tar.gz + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + *:jar + + + + \ No newline at end of file diff --git a/security/features/org.argeo.security.dep.node.rcp/META-INF/MANIFEST.MF b/security/features/org.argeo.security.dep.node.rcp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..786a1185a --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Private-Package: . +Tool: Bnd-1.15.0 +Bundle-Name: Commons Node RCP Dependencies +Created-By: 1.6.0_0 (Sun Microsystems Inc.) +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: Argeo +Bundle-Version: 0.2.3.SNAPSHOT-r20110316_174851 +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-SymbolicName: org.argeo.security.dep.node.rcp +Bundle-DocURL: http://www.argeo.org + diff --git a/security/features/org.argeo.security.dep.node.rcp/org.argeo.security.dep.node.rcp-maven.target b/security/features/org.argeo.security.dep.node.rcp/org.argeo.security.dep.node.rcp-maven.target new file mode 100644 index 000000000..069a0f37d --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/org.argeo.security.dep.node.rcp-maven.target @@ -0,0 +1,688 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/security/features/org.argeo.security.dep.node.rcp/p2.inf b/security/features/org.argeo.security.dep.node.rcp/p2.inf new file mode 100644 index 000000000..0423aa509 --- /dev/null +++ b/security/features/org.argeo.security.dep.node.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/security/features/org.argeo.security.dep.node.rcp/pom.xml b/security/features/org.argeo.security.dep.node.rcp/pom.xml new file mode 100644 index 000000000..e93a6c450 --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml @@ -0,0 +1,62 @@ + + 4.0.0 + + org.argeo.commons.security + 0.2.3-SNAPSHOT + features + .. + + org.argeo.security.dep.node.rcp + Commons Node RCP Dependencies + jar + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + + + + + + + + + + + + + + + + + + + + + + + + + org.argeo.commons.server + org.argeo.jcr.ui.explorer + ${version.argeo-commons} + + + + + org.argeo.commons.security + org.argeo.security.dep.node + ${version.argeo-commons} + pom + + + org.argeo.commons.security + org.argeo.security.ui.rcp + ${version.argeo-commons} + + + diff --git a/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml b/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml new file mode 100644 index 000000000..b0089eb9d --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86.xml @@ -0,0 +1,42 @@ + + + + linux.x86 + argeo-node-ui + + tar.gz + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + *:jar + + + org.eclipse.swt:org.eclipse.swt*:jar + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + org.eclipse.swt:org.eclipse.swt.gtk.linux.x86:jar + + + + \ No newline at end of file diff --git a/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml b/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml new file mode 100644 index 000000000..27454ed3f --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/src/assembly/linux.x86_64.xml @@ -0,0 +1,42 @@ + + + + linux.x86_64 + argeo-node-ui + + tar.gz + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + *:jar + + + org.eclipse.swt:org.eclipse.swt*:jar + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:jar + + + + \ No newline at end of file diff --git a/security/features/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml b/security/features/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml new file mode 100644 index 000000000..9b7a27bbb --- /dev/null +++ b/security/features/org.argeo.security.dep.node.rcp/src/assembly/win32.x86.xml @@ -0,0 +1,42 @@ + + + + win32.x86 + argeo-node-ui + + zip + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + *:jar + + + org.eclipse.swt:org.eclipse.swt*:jar + + + + false + ${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension} + + lib + + org.eclipse.swt:org.eclipse.swt.win32.win32.x86:jar + + + + \ No newline at end of file diff --git a/security/features/pom.xml b/security/features/pom.xml new file mode 100644 index 000000000..d45b7ac17 --- /dev/null +++ b/security/features/pom.xml @@ -0,0 +1,91 @@ + + + 4.0.0 + + org.argeo.commons + 0.2.3-SNAPSHOT + security + .. + + org.argeo.commons.security + features + Commons Security Features + pom + + org.argeo.security.dep.node.rap + org.argeo.security.dep.node.rcp + + + + + . + + *.inf + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + false + + + + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + + META-INF + + + + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + resolve-pde-sources + + pde-sources + + generate-resources + + + generate-descriptors + + descriptors + + generate-resources + + + check-osgi + test + + equinox + + + true + + -clean + + + + + + + + + + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui.application/.classpath b/security/plugins/org.argeo.security.ui.rap/.classpath similarity index 100% rename from security/plugins/org.argeo.security.ui.application/.classpath rename to security/plugins/org.argeo.security.ui.rap/.classpath diff --git a/security/plugins/org.argeo.security.ui.application/.project b/security/plugins/org.argeo.security.ui.rap/.project similarity index 92% rename from security/plugins/org.argeo.security.ui.application/.project rename to security/plugins/org.argeo.security.ui.rap/.project index e83b5d5d9..d20bec7fc 100644 --- a/security/plugins/org.argeo.security.ui.application/.project +++ b/security/plugins/org.argeo.security.ui.rap/.project @@ -1,6 +1,6 @@ - org.argeo.security.ui.application + org.argeo.security.ui.rap diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml index a80c02943..4b44d7050 100644 --- a/security/plugins/org.argeo.security.ui.rap/pom.xml +++ b/security/plugins/org.argeo.security.ui.rap/pom.xml @@ -25,57 +25,47 @@ maven-jar-plugin - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - resolve-pde-sources - - pde-sources - - generate-resources - - - generate-descriptors - - descriptors - - generate-resources - - - check-osgi - test - - equinox - - - true - - -clean - - - - + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + + + + lazy + org.eclipse.rap.ui,org.eclipse.core.runtime + * + + + + + org.argeo.commons.basic + org.argeo.basic.nodeps + ${version.argeo-commons} + + + + + org.slf4j + com.springsource.slf4j.org.apache.commons.logging + + + org.argeo.commons.security - org.argeo.security.ui.application + org.argeo.security.ui ${version.argeo-commons} - - - org.argeo.commons.eclipse - org.argeo.eclipse.dep.rcp - - - org.argeo.commons.eclipse - org.argeo.eclipse.ui.rcp - - - + + org.argeo.commons.security + org.argeo.security.equinox + ${version.argeo-commons} + + + org.argeo.commons.eclipse org.argeo.eclipse.dep.rap @@ -91,14 +81,5 @@ org.argeo.server.osgi.webapp ${version.argeo-commons} - - - - org.argeo.commons.security - org.argeo.security.dep.node - ${version.argeo-commons} - pom - test - diff --git a/security/plugins/org.argeo.security.ui.rcp/.classpath b/security/plugins/org.argeo.security.ui.rcp/.classpath new file mode 100644 index 000000000..92f19d2ff --- /dev/null +++ b/security/plugins/org.argeo.security.ui.rcp/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/security/plugins/org.argeo.security.ui.rcp/.project b/security/plugins/org.argeo.security.ui.rcp/.project new file mode 100644 index 000000000..feeafcf5b --- /dev/null +++ b/security/plugins/org.argeo.security.ui.rcp/.project @@ -0,0 +1,28 @@ + + + org.argeo.security.ui.rcp + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/security/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs b/security/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from security/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs rename to security/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs diff --git a/security/plugins/org.argeo.security.ui.application/META-INF/jaas_default.txt b/security/plugins/org.argeo.security.ui.rcp/META-INF/jaas_default.txt similarity index 100% rename from security/plugins/org.argeo.security.ui.application/META-INF/jaas_default.txt rename to security/plugins/org.argeo.security.ui.rcp/META-INF/jaas_default.txt diff --git a/security/plugins/org.argeo.security.ui.application/build.properties b/security/plugins/org.argeo.security.ui.rcp/build.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.application/build.properties rename to security/plugins/org.argeo.security.ui.rcp/build.properties diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_about.gif b/security/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_about.gif rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns b/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico b/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm b/security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif b/security/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif diff --git a/security/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif b/security/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif similarity index 100% rename from security/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif rename to security/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif diff --git a/security/plugins/org.argeo.security.ui.application/log4j.properties b/security/plugins/org.argeo.security.ui.rcp/log4j.properties similarity index 100% rename from security/plugins/org.argeo.security.ui.application/log4j.properties rename to security/plugins/org.argeo.security.ui.rcp/log4j.properties diff --git a/security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product b/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product similarity index 100% rename from security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product rename to security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product diff --git a/security/plugins/org.argeo.security.ui.application/plugin.xml b/security/plugins/org.argeo.security.ui.rcp/plugin.xml similarity index 91% rename from security/plugins/org.argeo.security.ui.application/plugin.xml rename to security/plugins/org.argeo.security.ui.rcp/plugin.xml index d09ed7536..ae0eef408 100644 --- a/security/plugins/org.argeo.security.ui.application/plugin.xml +++ b/security/plugins/org.argeo.security.ui.rcp/plugin.xml @@ -43,7 +43,7 @@ thread="main" visible="true"> + class="org.argeo.security.ui.rcp.SecureRcp"> @@ -55,7 +55,7 @@ thread="main" visible="true"> + class="org.argeo.security.ui.rcp.SecureRap"> @@ -67,7 +67,7 @@ thread="main" visible="true"> + class="org.argeo.security.ui.rcp.SecureRap"> diff --git a/security/plugins/org.argeo.security.ui.application/plugin_customization.ini b/security/plugins/org.argeo.security.ui.rcp/plugin_customization.ini similarity index 100% rename from security/plugins/org.argeo.security.ui.application/plugin_customization.ini rename to security/plugins/org.argeo.security.ui.rcp/plugin_customization.ini diff --git a/security/plugins/org.argeo.security.ui.application/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml similarity index 60% rename from security/plugins/org.argeo.security.ui.application/pom.xml rename to security/plugins/org.argeo.security.ui.rcp/pom.xml index 8ce61c242..f7d58b02e 100644 --- a/security/plugins/org.argeo.security.ui.application/pom.xml +++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml @@ -7,8 +7,8 @@ plugins .. - org.argeo.security.ui.application - Commons Security UI Application + org.argeo.security.ui.rcp + Commons Security UI RCP jar @@ -30,49 +30,29 @@ ${version.maven-bundle-plugin} - org.argeo.security.ui.application.SecureApplicationActivator + org.argeo.security.ui.rcp.SecureApplicationActivator lazy - org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime + org.eclipse.ui,org.eclipse.core.runtime * - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - resolve-pde-sources - - pde-sources - - generate-resources - - - generate-descriptors - - descriptors - - generate-resources - - - check-osgi - test - - equinox - - - true - - -clean - - - - - + + + org.argeo.commons.basic + org.argeo.basic.nodeps + ${version.argeo-commons} + + + + + org.slf4j + com.springsource.slf4j.org.apache.commons.logging + + org.argeo.commons.security @@ -85,7 +65,7 @@ ${version.argeo-commons} - + org.argeo.commons.eclipse org.argeo.eclipse.ui.rcp @@ -95,30 +75,6 @@ org.argeo.commons.eclipse org.argeo.eclipse.dep.rcp ${version.argeo-commons} - provided - - - - - org.argeo.commons.basic - org.argeo.basic.nodeps - ${version.argeo-commons} - - - - - - org.slf4j - com.springsource.slf4j.org.apache.commons.logging - - - - - org.argeo.commons.security - org.argeo.security.dep.node - ${version.argeo-commons} - pom - test diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java similarity index 98% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java index d866cb69c..2a9dd0c25 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import java.security.PrivilegedAction; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java similarity index 96% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java index fb4911a08..252972cd8 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java similarity index 98% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java index 61a3c0407..c32cd2999 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.ICoolBarManager; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureApplicationActivator.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java similarity index 95% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureApplicationActivator.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java index ec5d625de..53d2a7570 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureApplicationActivator.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureApplicationActivator.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import java.net.URL; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java similarity index 95% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java index 5f2ea3edc..964de7c39 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbench; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java similarity index 91% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java index b8576c4b9..cd1d518b4 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.equinox.app.IApplication; import org.eclipse.ui.PlatformUI; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java similarity index 94% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java index 698fdf743..191a83aef 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchAdvisor; diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java similarity index 95% rename from security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java rename to security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java index 1eb5c6787..e4edf78f1 100644 --- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java +++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.application; +package org.argeo.security.ui.rcp; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.application.ActionBarAdvisor; diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml index 71a536b46..b9a026858 100644 --- a/security/plugins/pom.xml +++ b/security/plugins/pom.xml @@ -14,7 +14,7 @@ org.argeo.security.equinox org.argeo.security.ui - org.argeo.security.ui.application + org.argeo.security.ui.rcp org.argeo.security.ui.rap diff --git a/security/pom.xml b/security/pom.xml index bc3859e07..8d6d21d42 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -15,6 +15,7 @@ modules plugins dep + features demo \ No newline at end of file diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml index 16aabfad7..0045fcb2a 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml @@ -9,43 +9,6 @@ org.argeo.jcr.ui.explorer Commons JCR Explorer - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - resolve-pde-sources - - pde-sources - - generate-resources - - - generate-descriptors - - descriptors - - generate-resources - - - check-osgi - test - - equinox - - - true - - -clean - - - - - - - org.argeo.commons.eclipse @@ -60,14 +23,5 @@ 0.2.3-SNAPSHOT provided - - - - org.argeo.commons.server - org.argeo.server.dep.node - ${version.argeo-commons} - pom - test - diff --git a/server/pom.xml b/server/pom.xml index 5ddf063cb..0254ba957 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -13,6 +13,7 @@ modules runtime + plugins dep demo -- 2.30.2