From: Bruno Sinou Date: Mon, 13 Dec 2010 15:52:58 +0000 (+0000) Subject: Add a Rap interface to handle SLC. X-Git-Tag: argeo-slc-2.1.7~1063 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=cfec56fbaf66e04f4020b47c70cbdd475b5cff41;p=gpl%2Fargeo-slc.git Add a Rap interface to handle SLC. Now, everything is launched in the same VM: the slc server, the web server and the rap part. git-svn-id: https://svn.argeo.org/slc/trunk@3973 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/eclipse/plugins/modules/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF b/eclipse/plugins/modules/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF index e47000dae..be1074d3d 100644 --- a/eclipse/plugins/modules/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF +++ b/eclipse/plugins/modules/org.argeo.slc.client.hibernate/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Hibernate Interface for RCP Client Bundle-SymbolicName: org.argeo.slc.client.hibernate Bundle-Version: 0.13.1.SNAPSHOT -Require-Bundle: org.eclipse.ui;resolution:=optional +Require-Bundle: org.eclipse.ui;resolution:=optional, + org.eclipse.rap.ui;resolution:=optional Import-Package: org.aopalliance.aop;version="1.0.0", org.argeo.slc.client.aspects, org.argeo.slc.client.contentprovider, diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF index 19a3bb3fa..37f8461eb 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF +++ b/eclipse/plugins/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF @@ -4,7 +4,9 @@ Bundle-Name: Client commons Bundle-SymbolicName: org.argeo.slc.client.commons;singleton:=true Bundle-Version: 0.13.1.SNAPSHOT Require-Bundle: org.eclipse.ui;resolution:=optional, - org.eclipse.core.runtime;resolution:=optional + org.eclipse.core.runtime;resolution:=optional, + org.eclipse.rap.ui;resolution:=optional, + org.eclipse.rap.ui.workbench;resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.argeo.slc.client.ui diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF index 5d03a1213..a79376c48 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF +++ b/eclipse/plugins/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.argeo.slc.client.aspects, org.argeo.slc.client.contentprovider Require-Bundle: org.springframework.orm;bundle-version="2.5.6", - org.eclipse.ui;resolution:=optional + org.eclipse.ui;resolution:=optional, + org.eclipse.rap.ui;resolution:=optional Import-Package: org.apache.commons.io;version="1.4.0", org.apache.commons.logging;version="1.1.1", org.argeo.eclipse.spring, diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF index 90c9fc561..c744c3120 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: Test Bundle to solve use case issues Bundle-SymbolicName: org.argeo.slc.client.oxm Export-Package: org.argeo.slc.client.oxm Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.ui +Require-Bundle: org.eclipse.ui;resolution:=optional Import-Package: org.argeo.slc, org.springframework.core, org.springframework.oxm, diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/MANIFEST.MF index ee1ed7c44..d380602a7 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/MANIFEST.MF +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/MANIFEST.MF @@ -5,7 +5,9 @@ Bundle-SymbolicName: org.argeo.slc.client.ui;singleton:=true Bundle-Version: 0.13.1.SNAPSHOT Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin Require-Bundle: org.eclipse.ui;resolution:=optional, - org.eclipse.core.runtime;resolution:=optional + org.eclipse.core.runtime;resolution:=optional, + org.eclipse.rap.ui;resolution:=optional, + org.eclipse.rap.ui.workbench;resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.argeo.slc.client.ui.listeners, @@ -36,6 +38,7 @@ Import-Package: org.apache.commons.io;version="1.4.0", org.argeo.slc.services.impl, org.argeo.slc.test, org.eclipse.core.expressions, + org.eclipse.ui.plugin, org.springframework.beans.factory, org.springframework.context, org.springframework.core.io.support diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java index 5785305ab..311b64ac0 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/controllers/ProcessController.java @@ -1,15 +1,21 @@ package org.argeo.slc.client.ui.controllers; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.services.SlcExecutionService; public class ProcessController { + private final static Log log = LogFactory.getLog(ProcessController.class); private SlcExecutionService slcExecutionService; public void execute(SlcAgent agent, SlcExecution slcExecution) { slcExecutionService.newExecution(slcExecution); agent.runSlcExecution(slcExecution); + if (log.isDebugEnabled()) + log.debug("SlcExcution " + slcExecution.getUuid() + + " launched on Agent " + agent.toString()); } public void setSlcExecutionService(SlcExecutionService slcExecutionService) { diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java index 1ea1d1361..37000e2a1 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java @@ -89,11 +89,11 @@ public class ProcessBuilderView extends ViewPart { Table table = new Table(parent, style); - GridData gridData = new GridData(GridData.FILL_BOTH); - gridData.grabExcessVerticalSpace = true; - gridData.grabExcessHorizontalSpace = true; - gridData.horizontalSpan = 3; - table.setLayoutData(gridData); +// GridData gridData = new GridData(GridData.FILL_BOTH); +// gridData.grabExcessVerticalSpace = true; +// gridData.grabExcessHorizontalSpace = true; +// gridData.horizontalSpan = 3; +// table.setLayoutData(gridData); table.setLinesVisible(true); table.setHeaderVisible(true); diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessListView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessListView.java index 83194d603..0d356bf8b 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessListView.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessListView.java @@ -62,11 +62,11 @@ public class ProcessListView extends ViewPart { Table table = new Table(parent, style); - GridData gridData = new GridData(GridData.FILL_BOTH); - gridData.grabExcessVerticalSpace = true; - gridData.grabExcessHorizontalSpace = true; - gridData.horizontalSpan = 3; - table.setLayoutData(gridData); +// GridData gridData = new GridData(GridData.FILL_BOTH); +// gridData.grabExcessVerticalSpace = true; +// gridData.grabExcessHorizontalSpace = true; +// gridData.horizontalSpan = 3; +// table.setLayoutData(gridData); table.setLinesVisible(true); table.setHeaderVisible(true); diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultDetailView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultDetailView.java index 9901fcd1b..2c81ffdce 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultDetailView.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultDetailView.java @@ -8,7 +8,6 @@ import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; @@ -43,9 +42,9 @@ public class ResultDetailView extends ViewPart { public void createPartControl(Composite parent) { resultDetailTree = new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - gd.horizontalSpan = 3; - resultDetailTree.setLayoutData(gd); + // GridData gd = new GridData(GridData.FILL_HORIZONTAL); + // gd.horizontalSpan = 3; + // resultDetailTree.setLayoutData(gd); resultDetailTree.setLinesVisible(true); resultDetailTree.setHeaderVisible(true); diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java index fd6233932..d49d67026 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java @@ -95,11 +95,11 @@ public class ResultListView extends ViewPart { Table table = new Table(parent, style); // table.addMouseListener(new RightClickListener()); - GridData gridData = new GridData(GridData.FILL_BOTH); - gridData.grabExcessVerticalSpace = true; - gridData.grabExcessHorizontalSpace = true; - gridData.horizontalSpan = 3; - table.setLayoutData(gridData); + //GridData gridData = new GridData(GridData.FILL_BOTH); + //gridData.grabExcessVerticalSpace = true; + //gridData.grabExcessHorizontalSpace = true; + //gridData.horizontalSpan = 3; + //table.setLayoutData(gridData); table.setLinesVisible(true); table.setHeaderVisible(true);