Improve single sourcing

diff --git a/org.argeo.suite.apps/bnd.bnd b/org.argeo.suite.apps/bnd.bnd
index 9b62a3f29177ffcae6bd71c0ef35d0ee2de84e92..077a108e75851e8a7a9ae1602cfa95edf26ff1ef 100644 (file)
--- a/org.argeo.suite.apps/bnd.bnd
+++ b/org.argeo.suite.apps/bnd.bnd
@@ -4,9 +4,11 @@ cms.datamodel; filter:="(name=tracker)"
 
 Bundle-Activator: org.argeo.suite.workbench.AsUiPlugin
 Bundle-SymbolicName: org.argeo.suite.apps;singleton:=true
-Require-Bundle: org.eclipse.core.runtime,\
- org.eclipse.rap.ui,\
- org.eclipse.rap.ui.workbench
+#Require-Bundle: org.eclipse.core.runtime,\
+# org.eclipse.rap.ui,\
+# org.eclipse.rap.ui.workbench
+#Require-Bundle:       org.eclipse.core.runtime,\
+#org.eclipse.core.commands
 
 Import-Package:\
 javax.jcr.nodetype,\

diff --git a/org.argeo.suite.apps/plugin.xml b/org.argeo.suite.apps/plugin.xml
index 01657b7ab2d8a9bbcd0d6b3d8b17c047f5fa844d..8e8c5f183317f35fc6265be21741d134c2eadd0d 100644 (file)
--- a/org.argeo.suite.apps/plugin.xml
+++ b/org.argeo.suite.apps/plugin.xml
@@ -2,6 +2,7 @@
 <?eclipse version="3.6"?>
 <plugin>
        <!-- RAP workbench main entry point for the Argeo Suite core application --> 
+       <!--
        <extension
                point="org.eclipse.rap.ui.entrypoint">
                <entrypoint
@@ -11,7 +12,7 @@
                        brandingId="org.argeo.suite.workbench.rap.defaultBranding">
                </entrypoint>
        </extension>
-       
+       -->
        <!-- PERSPECTIVES -->
        <extension
          point="org.eclipse.ui.perspectives">
@@ -39,6 +40,7 @@
        </extension>
        
        <!-- BRANDING AND THEMES -->
+       <!--
        <extension
                point="org.eclipse.rap.ui.branding">
                <branding
@@ -56,12 +58,10 @@
        
        <extension  
             point="org.eclipse.equinox.http.registry.resources">  
-                <!-- Enable overwriting of link styles in the meta tags -->
-         <resource  
+        <resource  
                alias="/ui/suite/theme/classic-headerExt.css"  
                base-name="theme/argeo-classic/workbench-headerExt.css">  
          </resource>  
-         <!-- images -->
          <resource  
                alias="/ui/suite/img/logo-argeo.png"  
                base-name="theme/argeo-classic/img/logo-argeo.png">  
@@ -74,4 +74,5 @@
                        themeId="org.eclipse.rap.rwt.theme.Default"
                        file="theme/argeo-classic/workbench-ext.css" />
        </extension>
+       -->
 </plugin>

diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd
index 4d0e1e7d98180187a009c48dbe4b75d99f25735a..07ba2463aca6804350f02d98bba094ae354d795b 100644 (file)
--- a/org.argeo.suite.workbench.rap/bnd.bnd
+++ b/org.argeo.suite.workbench.rap/bnd.bnd
@@ -1,13 +1,22 @@
 Bundle-Activator: org.argeo.suite.workbench.AsUiPlugin
 Bundle-SymbolicName: org.argeo.suite.workbench.rap;singleton:=true
-Require-Bundle: org.eclipse.core.runtime,\
- org.eclipse.rap.ui,\
- org.eclipse.rap.ui.workbench
+#Require-Bundle: org.eclipse.core.runtime,\
+# org.eclipse.rap.ui,\
+# org.eclipse.rap.ui.workbench
+Require-Bundle:        org.eclipse.core.runtime,\
+org.eclipse.core.commands
+
 Bundle-ActivationPolicy: lazy
 
 Import-Package:\
 javax.jcr.nodetype,\
 javax.jcr.security,\
+org.eclipse.core.runtime.jobs,\
+org.eclipse.jface.window,\
+org.eclipse.jface.dialogs,\
+org.eclipse.swt,\
+org.eclipse.swt.widgets,\
+org.eclipse.ui.services,\
 org.argeo.activities,\
 org.argeo.activities.workbench.parts,\
 org.argeo.cms,\
@@ -26,4 +35,5 @@ org.argeo.people.workbench.rap.parts,\
 org.argeo.node,\
 org.argeo.util,\
 jxl.*;resolution:=optional,\
+org.argeo.cms.ui.workbench.rap;resolution:=optional,\
 *
\ No newline at end of file

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
index 950b7c5b5ededa22968b4ff2efe61af9477174a2..89de0eb593b1df8b081d802a57248c2066617b06 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
@@ -26,8 +26,8 @@ import org.argeo.connect.workbench.util.JcrViewerDClickListener;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.people.PeopleService;
-import org.argeo.suite.workbench.SuiteWorkbenchException;
 import org.argeo.suite.workbench.AsUiPlugin;
+import org.argeo.suite.workbench.SuiteWorkbenchException;
 import org.argeo.suite.workbench.internal.EntitySingleColumnLabelProvider;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
@@ -45,6 +45,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.part.ViewPart;
 
 /** A table with a quick search field. */
@@ -62,7 +63,7 @@ public class QuickSearchView extends ViewPart implements Refreshable {
 
        // This page widgets
        private TableViewer entityViewer;
-       private DelayedText filterTxt;
+       private Text filterTxt;
 
        @Override
        public void createPartControl(Composite parent) {
@@ -79,15 +80,16 @@ public class QuickSearchView extends ViewPart implements Refreshable {
                // Use a delayed text: the query won't be done until the user stop
                // typing for 800ms
                int style = SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL;
-               filterTxt = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY);
+               DelayedText delayedText = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY);
+               filterTxt = delayedText.getText();
                filterTxt.setLayoutData(EclipseUiUtils.fillWidth());
 
                final ServerPushSession pushSession = new ServerPushSession();
-               filterTxt.addDelayedModifyListener(pushSession, new ModifyListener() {
+               delayedText.addDelayedModifyListener(pushSession, new ModifyListener() {
                        private static final long serialVersionUID = 5003010530960334977L;
 
                        public void modifyText(ModifyEvent event) {
-                               filterTxt.getDisplay().asyncExec(new Runnable() {
+                               delayedText.getText().getDisplay().asyncExec(new Runnable() {
                                        @Override
                                        public void run() {
                                                refreshFilteredList();

diff --git a/sdk/argeo_suite_desktop.properties b/sdk/argeo_suite_desktop.properties
new file mode 100644 (file)
index 0000000..2a5f231
--- /dev/null
+++ b/sdk/argeo_suite_desktop.properties
@@ -0,0 +1,31 @@
+argeo.osgi.start.2.http=org.eclipse.equinox.http.servlet,org.eclipse.equinox.http.jetty,\
+org.eclipse.rap.rwt.osgi,org.eclipse.equinox.cm
+
+argeo.osgi.start.3.node=org.argeo.cms
+argeo.osgi.start.4.apps=org.eclipse.gemini.blueprint.extender
+argeo.osgi.start.5.workbench=org.eclipse.equinox.http.registry
+
+argeo.osgi.start.5.apps=org.argeo.suite.apps
+
+## Rap Workbench configuration
+## Open the user admin page by default when opening the workbench
+org.argeo.security.ui.initialPerspective=org.argeo.suite.workbench.rap.dashboardPerspective
+# Use the WorkbenchAppService to open a default home page
+org.argeo.ui.openHomeCommandId=org.argeo.connect.ui.openDefaultEditor
+
+## JCR BACKEND
+argeo.node.repo.type=h2
+
+### Jetty - test URL: http://localhost:7070
+org.osgi.service.http.port=7070
+
+
+log4j.configuration=file:../../log4j.properties
+
+# SECURITY
+java.security.manager=
+java.security.policy=file:../../all.policy
+
+# DON'T CHANGE BELOW
+eclipse.application=org.argeo.cms.ui.workbench.rcp.secureUi
+org.eclipse.equinox.http.jetty.autostart=false