diff --git a/org.flowerplatform.flexutil/src/org/flowerplatform/flexutil/mobile/view_content_host/MobileViewHostBase.as b/org.flowerplatform.flexutil/src/org/flowerplatform/flexutil/mobile/view_content_host/MobileViewHostBase.as
index ad95a3b7..ce2f597c 100644
--- a/org.flowerplatform.flexutil/src/org/flowerplatform/flexutil/mobile/view_content_host/MobileViewHostBase.as
+++ b/org.flowerplatform.flexutil/src/org/flowerplatform/flexutil/mobile/view_content_host/MobileViewHostBase.as
@@ -234,13 +234,11 @@ package org.flowerplatform.flexutil.mobile.view_content_host {
}
});
- if (parentActionId == null) {
- // give the viewMenuItems to the actions so that it can calculate it's enablement
- openMenuAction.viewMenuItems = newViewMenuItems;
- viewMenuItems = newViewMenuItems;
+ // give the viewMenuItems to the actions so that it can calculate it's enablement
+ openMenuAction.viewMenuItems = newViewMenuItems;
+ viewMenuItems = newViewMenuItems;
- appendToActionContent(newActionContent);
- }
+ appendToActionContent(newActionContent);
}
/**
diff --git a/org.flowerplatform.web.app/WebContent/WEB-INF/flex/services-config.xml b/org.flowerplatform.web.app/WebContent/WEB-INF/flex/services-config.xml
index 4c1bfb58..b8342579 100644
--- a/org.flowerplatform.web.app/WebContent/WEB-INF/flex/services-config.xml
+++ b/org.flowerplatform.web.app/WebContent/WEB-INF/flex/services-config.xml
@@ -39,6 +39,7 @@
+
+
+
+
+
+
+
+ true
+
+
+
+
+ Custom
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ 0
+
+
+ 30000
+
+
+ 200
+
+
+ false
+
+ true
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [BlazeDS Flower Web]
+ false
+ false
+ false
+ true
+
+
+ *
+ Endpoint.*
+ Service.*
+ Configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.flowerplatform.web.mobile/WebContent/WEB-INF/web.xml b/org.flowerplatform.web.mobile/WebContent/WEB-INF/web.xml
new file mode 100644
index 00000000..383402ef
--- /dev/null
+++ b/org.flowerplatform.web.mobile/WebContent/WEB-INF/web.xml
@@ -0,0 +1,112 @@
+
+
+ org.flowerplatform.web.app
+
+ equinoxbridgeservlet
+ org.eclipse.equinox.servletbridge.BridgeServlet
+
+ commandline
+ -console -consoleLog
+
+
+ enableFrameworkControls
+ true
+
+
+
+ extendedFrameworkExports
+
+
+
+
+
+ frameworkLauncherClass
+ org.flowerplatform.web.app.FlowerFrameworkLauncher
+
+
+
+
+ developmentLaunchConfigurationWindows
+ Flower Platform - Web (write plugin config to file)
+
+
+ developmentLaunchConfigurationLinux
+ Flower Platform - Web Linux
+
+
+
+
+ eclipseConfigurationLocation
+ WEB-INF/eclipse/configuration
+
+
+
+
+ workspaceLocation
+ ../git_repo_fp/org.flowerplatform.web.app/workspace
+
+
+ 1
+
+
+
+ equinoxbridgeservlet
+ /messagebroker/*
+
+
+ equinoxbridgeservlet
+ /servlet/*
+
+
+
+
+ 10
+
+
+
+
+
+ main.jsp
+
+
\ No newline at end of file
diff --git a/org.flowerplatform.web.mobile/src/MainMobile.mxml b/org.flowerplatform.web.mobile/src/MainMobile.mxml
index d361a7ff..baf7a877 100644
--- a/org.flowerplatform.web.mobile/src/MainMobile.mxml
+++ b/org.flowerplatform.web.mobile/src/MainMobile.mxml
@@ -116,6 +116,7 @@
private var plugins:Array = [
setDescriptorWithUrl(new CommonPlugin(), 'servlet/public-resources/org.flowerplatform.common/swc/org.flowerplatform.common.swc|library.swf'),
setDescriptorWithUrl(new CommunicationPlugin(), 'servlet/public-resources/org.flowerplatform.communication/swc/org.flowerplatform.communication.swc|library.swf'),
+ setDescriptorWithUrl(new PropertiesPlugin(), 'servlet/public-resources/org.flowerplatform.properties/swc/org.flowerplatform.properties.swc|library.swf?pluginClass=PropertiesPlugin'),
setDescriptorWithUrl(new EditorPlugin(), 'servlet/public-resources/org.flowerplatform.editor/swc/org.flowerplatform.editor.swc|library.swf'),
setDescriptorWithUrl(new EditorTextPlugin(), 'servlet/public-resources/org.flowerplatform.editor.text/swc/org.flowerplatform.editor.text.swc|library.swf?pluginClass=EditorTextPlugin'),
setDescriptorWithUrl(new EditorTextJavaPlugin(), 'servlet/public-resources/org.flowerplatform.editor.text.java/swc/org.flowerplatform.editor.text.java.swc|library.swf?pluginClass=EditorTextJavaPlugin'),
@@ -126,7 +127,6 @@
setDescriptorWithUrl(new CodeSyncPlugin(), 'servlet/public-resources/org.flowerplatform.codesync/swc/org.flowerplatform.codesync.swc|library.swf?pluginClass=CodeSyncPlugin'),
setDescriptorWithUrl(new CodeSyncCodeJavaPlugin(), 'servlet/public-resources/org.flowerplatform.codesync.code.java/swc/org.flowerplatform.codesync.code.java.swc|library.swf?pluginClass=CodeSyncCodeJavaPlugin'),
setDescriptorWithUrl(new CodeSyncCodeJavascriptPlugin(), 'servlet/public-resources/org.flowerplatform.codesync.code.javascript/swc/org.flowerplatform.codesync.code.javascript.swc|library.swf?pluginClass=CodeSyncCodeJavascriptPlugin'),
- setDescriptorWithUrl(new PropertiesPlugin(), 'servlet/public-resources/org.flowerplatform.properties/swc/org.flowerplatform.properties.swc|library.swf?pluginClass=PropertiesPlugin'),
setDescriptorWithUrl(new MindMapModelPlugin(), 'servlet/public-resources/org.flowerplatform.editor.mindmap/swc/org.flowerplatform.editor.mindmap.swc|library.swf?pluginClass=MindMapModelPlugin')
];
@@ -153,10 +153,6 @@
startPlugins();
- // unfortunately, for unknown reasons despite investigations and discussions on forum, the streaming
- // channel doesn't work properly. It disconnects and reconnects after about 40 sec. See mindmap.
- CommunicationPlugin.getInstance().bridge.initializeChannelSet(BlazeDSBridge.BLAZEDS_POLLING_CHANNEL);
-
CommunicationPlugin.getInstance().bridge.addEventListener(BridgeEvent.WELCOME_RECEIVED_FROM_SERVER, welcomeReceivedFromServerHandler);
}