removed atmosphere dependencies and apache lang3 package dependencies.

Evolveum · Jul 1, 2014 · d9c090e · d9c090e
1 parent 29b1507
commit d9c090e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 189 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
@@ -24,7 +24,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypeDialog;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
@@ -39,14 +39,11 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.atmosphere.NotifyMessage;
-import com.evolveum.midpoint.web.component.atmosphere.NotifyMessageFilter;
 import com.evolveum.midpoint.web.component.menu.top.MenuBarItem;
 import com.evolveum.midpoint.web.component.menu.top.TopMenuBar;
 import com.evolveum.midpoint.web.component.message.MainFeedback;
 import com.evolveum.midpoint.web.component.message.OpResult;
 import com.evolveum.midpoint.web.component.message.TempFeedback;
-import com.evolveum.midpoint.web.component.message2.FeedbackAlerts;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
@@ -64,7 +61,6 @@
 import org.apache.wicket.RuntimeConfigurationType;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.atmosphere.Subscribe;
 import org.apache.wicket.devutils.debugbar.DebugBar;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.feedback.FeedbackMessage;
@@ -623,20 +619,4 @@ public void handleGlobalError(OperationResult currentResult) {
 
         result.computeStatus();
     }
-
-    @Subscribe(filter = NotifyMessageFilter.class)
-    public void receiveNotifyMessage(AjaxRequestTarget target, NotifyMessage message) {
-        LOGGER.trace("Received notify message {}.", new Object[]{message});
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("$.pnotify({\n");
-        sb.append("\ttitle: '").append(createStringResource(message.getTitle()).getString()).append("',\n");
-        sb.append("\ttext: '").append(createStringResource(message.getMessage()).getString()).append("',\n");
-        sb.append("\ttype: '").append(message.getMessageType().name().toLowerCase()).append("',\n");
-        sb.append("\topacity: .8,\n");
-        sb.append("\ticon: '").append(message.getIcon()).append("'\n");
-        sb.append("});");
-
-        target.appendJavaScript(sb.toString());
-    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
@@ -47,7 +47,7 @@
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
@@ -27,7 +27,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType;
 import com.evolveum.midpoint.xml.ns.model.workflow.process_instance_state_3.ProcessInstanceState;
 
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.Validate;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -39,7 +39,6 @@
 import com.evolveum.midpoint.wf.api.WorkflowManager;
 import org.apache.commons.configuration.Configuration;
 import org.apache.wicket.RuntimeConfigurationType;
-import org.apache.wicket.atmosphere.EventBus;
 import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.core.request.handler.PageProvider;
@@ -82,8 +81,6 @@ public class MidPointApplication extends AuthenticatedWebApplication {
 
     private static final Trace LOGGER = TraceManager.getTrace(MidPointApplication.class);
 
-    private EventBus eventBus;
-
     @Autowired
     transient ModelService model;
     @Autowired
@@ -232,10 +229,6 @@ public ModelInteractionService getModelInteractionService() {
         return modelInteractionService;
     }
 
-    public EventBus getEventBus() {
-        return eventBus;
-    }
-
     private static class ResourceFileFilter implements FilenameFilter {
 
         @Override