From 526755f2b662a8b6849903c3cf075d14ca05e452 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 15 Apr 2011 17:55:51 +0000 Subject: [PATCH] Improve RAP and RCP git-svn-id: https://svn.argeo.org/slc/trunk@4438 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/slc_demo_rap.properties | 2 +- demo/slc_demo_rcp.properties | 6 +- .../META-INF/spring/client-osgi.xml | 2 +- .../org.argeo.slc.client.rap/.classpath | 14 ++-- .../.settings/org.eclipse.jdt.core.prefs | 16 ++--- .../META-INF/MANIFEST.MF | 3 +- .../org.argeo.slc.client.rap/plugin.xml | 52 -------------- .../rap/ApplicationActionBarAdvisor.java | 24 ------- .../rap/ApplicationWorkbenchAdvisor.java | 22 ------ .../org/argeo/slc/client/rap/Perspective.java | 14 ---- .../slc/client/rap/SlcClientRapPlugin.java | 68 ------------------- .../SlcRapSecureWorkbenchWindowAdvisor.java | 36 ---------- .../argeo/slc/client/rap/SlcSecureRap.java | 16 ----- .../META-INF/MANIFEST.MF | 1 - .../org.argeo.slc.client.rcp/plugin.xml | 36 +--------- .../META-INF/MANIFEST.MF | 1 - .../org.argeo.slc.client.ui/plugin.xml | 10 ++- ...tion.java => SlcExecutionPerspective.java} | 4 +- 18 files changed, 33 insertions(+), 294 deletions(-) delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java delete mode 100644 eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java rename eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/{perspectives/SlcExecution.java => SlcExecutionPerspective.java} (93%) diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties index 583101abf..00ab25e90 100644 --- a/demo/slc_demo_rap.properties +++ b/demo/slc_demo_rap.properties @@ -33,7 +33,7 @@ org.argeo.slc.demo.basic,\ eclipse.ignoreApp=true osgi.noShutdown=true -org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution +org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective log4j.configuration=file:../../log4j.properties diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties index 5b51e35a6..c3b5c3e19 100644 --- a/demo/slc_demo_rcp.properties +++ b/demo/slc_demo_rcp.properties @@ -5,9 +5,9 @@ org.argeo.slc.demo.ant,\ org.argeo.slc.demo.basic,\ eclipse.application=org.argeo.slc.client.rcp.application -org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution +org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective log4j.configuration=file:../../log4j.properties -argeo.node.repo.home=~/.argeo/server_noderepo -argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db +argeo.node.repo.home=${system_property:osgi.instance.area}/noderepo +argeo.node.repo.dburl=jdbc:h2:${system_property:osgi.instance.area}/h2/noderepo_db diff --git a/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml b/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml index eb766a5f9..5d3eced59 100644 --- a/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml +++ b/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.classpath b/eclipse/plugins/org.argeo.slc.client.rap/.classpath index eff0df67e..0eb4407a8 100644 --- a/eclipse/plugins/org.argeo.slc.client.rap/.classpath +++ b/eclipse/plugins/org.argeo.slc.client.rap/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs index fd3794f86..8b45224bc 100644 --- a/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ -#Wed Nov 24 21:23:34 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +#Thu Apr 14 17:49:18 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF index 10aef160f..3f5db65e8 100644 --- a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF @@ -3,10 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: Rap Client for SLC Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true Bundle-Version: 0.13.1.SNAPSHOT -Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin Bundle-Vendor: Argeo SASU Require-Bundle: org.eclipse.rap.ui;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: javax.servlet;version="2.4.0", javax.servlet.http;version="2.4.0", diff --git a/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml index f7715af65..e51a32853 100644 --- a/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml +++ b/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml @@ -2,24 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java deleted file mode 100644 index 62904be5b..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.argeo.slc.client.rap; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.application.ActionBarAdvisor; -import org.eclipse.ui.application.IActionBarConfigurer; - -/** - * Creates, adds and disposes actions for the menus and action bars of - * each workbench window. - */ -public class ApplicationActionBarAdvisor extends ActionBarAdvisor { - - public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { - super(configurer); - } - - protected void makeActions(IWorkbenchWindow window) { - } - - protected void fillMenuBar(IMenuManager menuBar) { - } - -} diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java deleted file mode 100644 index f272f05c7..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.argeo.slc.client.rap; - -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchAdvisor; -import org.eclipse.ui.application.WorkbenchWindowAdvisor; - -/** - * This workbench advisor creates the window advisor, and specifies - * the perspective id for the initial window. - */ -public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { - - private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.perspectives.slcExecution"; - - public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) { - return new SlcRapSecureWorkbenchWindowAdvisor(configurer); - } - - public String getInitialWindowPerspectiveId() { - return PERSPECTIVE_ID; - } -} diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java deleted file mode 100644 index 51c0f24e0..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.argeo.slc.client.rap; - -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - -/** - * Configures the perspective layout. This class is contributed - * through the plugin.xml. - */ -public class Perspective implements IPerspectiveFactory { - - public void createInitialLayout(IPageLayout layout) { - } -} diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java deleted file mode 100644 index 60ca36439..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.argeo.slc.client.rap; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class SlcClientRapPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.argeo.slc.client.rap"; //$NON-NLS-1$ - - // The shared instance - private static SlcClientRapPlugin plugin; - - /** - * The constructor - */ - public SlcClientRapPlugin() { - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext - * ) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext - * ) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static SlcClientRapPlugin getDefault() { - return plugin; - } - - /** - * Returns an image descriptor for the image file at the given plug-in - * relative path - * - * @param path - * the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } -} diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java deleted file mode 100644 index f96e97e72..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.argeo.slc.client.rap; - -import org.argeo.security.ui.rap.RapSecureWorkbenchWindowAdvisor; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; - -/** - * Configures the initial size and appearance of a workbench window. - */ -public class SlcRapSecureWorkbenchWindowAdvisor extends - RapSecureWorkbenchWindowAdvisor { - - public SlcRapSecureWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer) { - super(configurer); - } - - // Customisation of the main frame can be done here. - @Override - public void preWindowOpen() { - super.preWindowOpen(); - // - // IWorkbenchWindowConfigurer configurer = getWindowConfigurer(); - // configurer.setShowCoolBar(true); - // configurer.setShowMenuBar(true); - // configurer.setShowStatusLine(false); - // configurer.setShowPerspectiveBar(true); - // configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$ - // // Full screen, see - // // - // http://dev.eclipse.org/newslists/news.eclipse.technology.rap/msg02697.html - // configurer.setShellStyle(SWT.NONE); - // Rectangle bounds = Display.getDefault().getBounds(); - // configurer.setInitialSize(new Point(bounds.width, bounds.height)); - } - -} diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java index 492970055..c7ff8d4d1 100644 --- a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java +++ b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java @@ -1,26 +1,10 @@ package org.argeo.slc.client.rap; import org.argeo.security.ui.rap.SecureEntryPoint; -import org.argeo.security.ui.rap.SecureWorkbenchAdvisor; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchAdvisor; -import org.eclipse.ui.application.WorkbenchWindowAdvisor; /** * This class controls all aspects of the application's execution and is * contributed through the plugin.xml. */ public class SlcSecureRap extends SecureEntryPoint { - - - @Override - protected WorkbenchAdvisor createWorkbenchAdvisor() { - return new SecureWorkbenchAdvisor() { - public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer) { - return new SlcRapSecureWorkbenchWindowAdvisor(configurer); - } - - }; - } } diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF index 61a7e9d47..304491516 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.argeo.security.ui.rcp, - org.argeo.slc.client.ui.perspectives, org.argeo.slc.core.test.tree, org.argeo.slc.execution, org.argeo.slc.process, diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml index 58605baab..dc5ca4392 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml +++ b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml @@ -30,42 +30,8 @@ - - - - - - - - - - - - - - + - \ No newline at end of file + + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java similarity index 93% rename from eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java rename to eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java index acb72db3b..abc013020 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java @@ -1,10 +1,10 @@ -package org.argeo.slc.client.ui.perspectives; +package org.argeo.slc.client.ui; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; -public class SlcExecution implements IPerspectiveFactory { +public class SlcExecutionPerspective implements IPerspectiveFactory { public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); -- 2.39.2