catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.vaaclipse.addons.app/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources.xml b/org.eclipse.osbp.vaaclipse.addons.app/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources.xml
index 2d3323a..b906f4a 100644
--- a/org.eclipse.osbp.vaaclipse.addons.app/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources.xml
+++ b/org.eclipse.osbp.vaaclipse.addons.app/OSGI-INF/org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true" name="org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources">
- <implementation class="org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources"/>
<property name="http.alias" value="/VAADIN"/>
<reference bind="bindDSLMetadataService" cardinality="1..1" interface="org.eclipse.osbp.ui.api.metadata.IDSLMetadataService" name="bindDSLMetadataService" policy="dynamic" unbind="unbindDSLMetadataService"/>
<reference bind="bind" cardinality="1..1" interface="org.osgi.service.http.HttpService" name="bindHttpService" policy="static" target="(org.eclipse.osbp.ecview.jetty.serviceType=application)" unbind="unbind"/>
<reference bind="bindResourceInfoProvider" cardinality="1..1" interface="org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider" name="bindResourceInfoProvider" policy="static" unbind="unbindResourceInfoProvider"/>
<reference bind="bindThemeEngine" cardinality="1..1" interface="org.eclipse.osbp.vaaclipse.publicapi.theme.ThemeEngine" name="bindThemeEngine" policy="static" unbind="unbindThemeEngine"/>
+ <implementation class="org.eclipse.osbp.vaaclipse.addons.app.resources.StaticResources"/>
</scr:component>
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/VaadinE4Application.java b/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/VaadinE4Application.java
index 353e29b..2b91cb4 100644
--- a/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/VaadinE4Application.java
+++ b/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/VaadinE4Application.java
@@ -22,8 +22,11 @@
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import javax.swing.Box;
@@ -37,19 +40,19 @@
import org.eclipse.e4.ui.internal.workbench.WorkbenchLogger;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osbp.vaaclipse.addons.app.webapp.VaadinWebApplication;
+import org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider;
+import org.eclipse.osgi.service.datalocation.Location;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpService;
-import org.eclipse.osbp.vaaclipse.api.ResourceInfoProvider;
+import org.slf4j.LoggerFactory;
import com.vaadin.ui.themes.Reindeer;
/**
* The Class VaadinE4Application.
*/
-@SuppressWarnings("restriction")
public class VaadinE4Application implements IApplication, ResourceInfoProvider {
/** The queue. */
@@ -59,6 +62,8 @@
private Logger logger = new WorkbenchLogger(
"org.eclipse.osbp.vaaclipse.app");
+ private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(VaadinE4Application.class);
+
/** The app context. */
private IApplicationContext appContext;
@@ -173,7 +178,18 @@
registerServices();
- logger.debug("VaadinE4Application.start()");
+ log.error("VaadinE4Application.start()");
+ // get a RuntimeMXBean reference
+ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+
+ // get the jvm's input arguments as a list of strings
+ List<String> listOfArguments = runtimeMxBean.getInputArguments();
+
+ // print the arguments using my logger
+ for (String arg:listOfArguments) {
+ log.error("ARG: {}", arg);
+ }
+
context.applicationRunning();
queue = new ArrayBlockingQueue<String>(10);
diff --git a/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/webapp/VaadinUI.java b/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/webapp/VaadinUI.java
index 8f400cf..71156e2 100644
--- a/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/webapp/VaadinUI.java
+++ b/org.eclipse.osbp.vaaclipse.addons.app/src/org/eclipse/osbp/vaaclipse/addons/app/webapp/VaadinUI.java
@@ -37,7 +37,6 @@
import org.eclipse.e4.core.di.extensions.EventUtils;
import org.eclipse.e4.core.services.contributions.IContributionFactory;
import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.core.services.translation.TranslationProviderFactory;
import org.eclipse.e4.core.services.translation.TranslationService;
import org.eclipse.e4.ui.di.UISynchronize;
@@ -110,6 +109,7 @@
import com.vaadin.ui.UI;
import com.vaadin.ui.UIDetachedException;
import com.vaadin.ui.VerticalLayout;
+import org.eclipse.e4.core.services.log.Logger;
/**
* The Class VaadinUI.
