From 636529bb7df0774617693e452b04a4c61dda16cb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 19 Dec 2017 11:13:02 +0100 Subject: [PATCH] Improve packaging --- org.argeo.cms.ui/build.properties | 3 ++- .../src/org/argeo/cms/ui/internal/Activator.java | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/org.argeo.cms.ui/build.properties b/org.argeo.cms.ui/build.properties index 34d2e4d2d..c6baffa00 100644 --- a/org.argeo.cms.ui/build.properties +++ b/org.argeo.cms.ui/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + icons/ diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java index 475a95122..6417b25fe 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java @@ -1,10 +1,6 @@ package org.argeo.cms.ui.internal; -import org.argeo.cms.maintenance.MaintenanceUi; -import org.argeo.cms.ui.internal.rwt.UserUi; import org.argeo.node.NodeState; -import org.argeo.util.LangUtils; -import org.eclipse.rap.rwt.application.ApplicationConfiguration; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -19,9 +15,9 @@ public class Activator implements BundleActivator { // @Override public void start(BundleContext bc) throws Exception { // UI - bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(), - LangUtils.dico(CONTEXT_NAME_PROP, "system")); - bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.dico(CONTEXT_NAME_PROP, "user")); +// bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(), +// LangUtils.dico(CONTEXT_NAME_PROP, "system")); +// bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.dico(CONTEXT_NAME_PROP, "user")); nodeState = new ServiceTracker<>(bc, NodeState.class, null); nodeState.open(); -- 2.30.2