5:12 a.m.
Author: rob.stryker(a)jboss.com
Date: 2011-12-06 06:12:00 -0500 (Tue, 06 Dec 2011)
New Revision: 36991
Added:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10355 - openshift usability for branch
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
===================================================================
---
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -22,6 +22,17 @@
// public IJBossServerPublishMethodType getPublishMethodType();
public void publishStart(DeployableServerBehavior behaviour, IProgressMonitor monitor)
throws CoreException;
public int publishFinish(DeployableServerBehavior behaviour, IProgressMonitor monitor)
throws CoreException;
+
+ /**
+ * Publish this module
+ * @param behaviour The behaviour associated with this server
+ * @param kind The kind of publish, as a constant from IServer
+ * @param deltaKind The kind of delta, as a constant from ServerBehaviourDelegate
+ * @param module The module to be published
+ * @param monitor The progress monitor
+ * @return An IServer.STATE_XXX constant, or -1 if the behaviour should not change
server state
+ * @throws CoreException
+ */
public int publishModule(DeployableServerBehavior behaviour, int kind, int deltaKind,
IModule[] module, IProgressMonitor monitor) throws CoreException;
// Methods moved from publishers into the publish method
Added:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java
===================================================================
---
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java
(rev 0)
+++
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+/**
+ * A complete stub implementation of the interface
+ */
+public abstract class AbstractBehaviourDelegate implements IJBossBehaviourDelegate {
+
+ protected DelegatingServerBehavior actualBehavior;
+
+ @Override
+ public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
+ this.actualBehavior = actualBehaviour;
+ }
+
+ @Override
+ public String getBehaviourTypeId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void stop(boolean force) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void publishStart(IProgressMonitor monitor) throws CoreException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void publishFinish(IProgressMonitor monitor) throws CoreException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onServerStarting() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onServerStopping() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onServerStarted() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onServerStopped() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public IStatus canChangeState(String launchMode) {
+ // TODO Auto-generated method stub
+ return Status.CANCEL_STATUS;
+ }
+
+ @Override
+ public String getDefaultStopArguments() throws CoreException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
---
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -11,7 +11,6 @@
package org.jboss.ide.eclipse.as.core.server.internal;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
@@ -23,28 +22,14 @@
import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-public abstract class AbstractJBossBehaviourDelegate implements IJBossBehaviourDelegate
{
+public abstract class AbstractJBossBehaviourDelegate extends AbstractBehaviourDelegate {
- private DelegatingServerBehavior actualBehavior;
private PollThread pollThread = null;
- @Override
- public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
- this.actualBehavior = actualBehaviour;
- }
-
public IServer getServer() {
return actualBehavior.getServer();
}
- @Override
- public void publishStart(IProgressMonitor monitor) throws CoreException {
- }
-
- @Override
- public void publishFinish(IProgressMonitor monitor) throws CoreException {
- }
-
public void stop(boolean force) {
if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
actualBehavior.setServerStopped();
@@ -59,18 +44,6 @@
protected abstract IStatus gracefullStop();
- public void onServerStarting() {
- }
-
- public void onServerStopping() {
- }
-
- public void onServerStarted() {
- }
-
- public void onServerStopped() {
- }
-
@Override
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
@@ -157,9 +130,4 @@
protected void setServerStarting() {
actualBehavior.setServerStarting();
}
-
- @Override
- public void dispose() {
- // do nothing
- }
}
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
---
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -90,8 +90,10 @@
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
"Not publishing")); //$NON-NLS-1$
try {
int result = method.publishModule(this, kind, deltaKind, module, monitor);
- setModulePublishState(module, result);
- setModuleState(module, IServer.STATE_STARTED );
+ if( result != -1 ) {
+ setModulePublishState(module, result);
+ setModuleState(module, IServer.STATE_STARTED );
+ }
} catch(CoreException ce) {
setModulePublishState(module, IServer.PUBLISH_STATE_FULL);
setModuleState(module, IServer.STATE_UNKNOWN );
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java
===================================================================
---
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -4,6 +4,7 @@
import java.util.Iterator;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IContributionItem;
@@ -22,13 +23,12 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.ui.internal.cnf.ServerActionProvider;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
-import org.jboss.ide.eclipse.as.core.util.ModuleUtil;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
public class ModuleActionProvider extends CommonActionProvider {
private Action deleteModuleAction, fullPublishModuleAction,
incrementalPublishModuleAction;
@@ -126,12 +126,12 @@
for( int i = 0; i < selection.length; i++ ) {
IModule[] mod = selection[i].module;
s.setModulePublishState(mod, type);
- ArrayList<IModule[]> allChildren = ModuleUtil.getDeepChildren(s, mod);
+ ArrayList<IModule[]> allChildren = ServerModelUtilities.getDeepChildren(s,
mod);
for( int j = 0; j < allChildren.size(); j++ ) {
s.setModulePublishState((IModule[])allChildren.get(j), type);
}
}
- new PublishServerJob(s, IServer.PUBLISH_INCREMENTAL, true).schedule();
+ s.publish(IServer.PUBLISH_INCREMENTAL, null, getUserInitiatedAdaptable(), null);
}
}
@@ -152,7 +152,7 @@
(IModule[]) topModsToRemove.toArray(new IModule[topModsToRemove.size()]);
ServerUtil.modifyModules(serverWC, new IModule[0], modsToRemove, new
NullProgressMonitor());
IServer server2 = serverWC.save(true, null);
- new PublishServerJob(server2, IServer.PUBLISH_INCREMENTAL, true).schedule();
+ server2.publish(IServer.PUBLISH_INCREMENTAL, null, getUserInitiatedAdaptable(),
null);
}
} catch (CoreException e) {
// ignore
@@ -161,4 +161,15 @@
t.start();
}
}
+
+ public IAdaptable getUserInitiatedAdaptable() {
+ IAdaptable info = new IAdaptable() {
+ public Object getAdapter(Class adapter) {
+ if (String.class.equals(adapter))
+ return "user";
+ return null;
+ }
+ };
+ return info;
+ }
}
Modified:
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
---
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-12-06
11:12:00 UTC (rev 36991)
@@ -62,7 +62,7 @@
<extension
point="org.eclipse.wst.server.core.serverTypes">
<serverType
-
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior"
+
behaviourClass="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBehaviour"
class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
name="%openshift.express.name"
description="%openshift.express.description"
Added:
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
===================================================================
---
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
(rev 0)
+++
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.openshift.express.internal.core.behaviour;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.IModule;
+import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+
+public class ExpressBehaviour extends DelegatingServerBehavior {
+ private IAdaptable publishAdaptableInfo;
+ public void publish(int kind, List<IModule[]> modules, IProgressMonitor monitor,
IAdaptable info) throws CoreException {
+ publishAdaptableInfo = info;
+ try {
+ super.publish(kind, modules, monitor, info);
+ } finally {
+ publishAdaptableInfo = null;
+ }
+ }
+
+ public IAdaptable getPublishAdaptableInfo() {
+ return publishAdaptableInfo;
+ }
+}
Modified:
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
===================================================================
---
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -10,87 +10,15 @@
*******************************************************************************/
package org.jboss.tools.openshift.express.internal.core.behaviour;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.AbstractBehaviourDelegate;
-public class ExpressBehaviourDelegate implements IJBossBehaviourDelegate {
- private DelegatingServerBehavior realBehaviour;
+public class ExpressBehaviourDelegate extends AbstractBehaviourDelegate {
public ExpressBehaviourDelegate() {
- // TODO Auto-generated constructor stub
}
@Override
public String getBehaviourTypeId() {
return "openshift";
}
-
- @Override
- public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
- realBehaviour = actualBehaviour;
- }
-
- @Override
- public void stop(boolean force) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void publishStart(IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void publishFinish(IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void onServerStarting() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void onServerStopping() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public IStatus canChangeState(String launchMode) {
- return Status.CANCEL_STATUS;
- }
-
- @Override
- public String getDefaultStopArguments() throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void onServerStarted() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void onServerStopped() {
- // TODO Auto-generated method stub
-
- }
-
}
Modified:
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
---
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-06
11:11:55 UTC (rev 36990)
+++
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-06
11:12:00 UTC (rev 36991)
@@ -14,6 +14,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -54,13 +55,29 @@
shareProjects(projects);
projectsLackingGitRepo = null;
}
- return 0;
- }
+ IModule[] modules = behaviour.getServer().getModules();
+ boolean allpublished= true;
+ for (int i = 0; i < modules.length; i++) {
+ if(behaviour.getServer().getModulePublishState(new
IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE)
+ allpublished=false;
+ }
+ return allpublished ? IServer.PUBLISH_STATE_NONE :
IServer.PUBLISH_STATE_INCREMENTAL;
+ }
@Override
public int publishModule(DeployableServerBehavior behaviour, int kind,
int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
+
+ // If this action is not user-initiated, bail!
+ IAdaptable a = ((ExpressBehaviour)behaviour).getPublishAdaptableInfo();
+ if( a == null )
+ return -1;
+ String s = (String)a.getAdapter(String.class);
+ if( s == null || !s.equals("user"))
+ return -1;
+
+
int state = behaviour.getServer().getModulePublishState(module);
IProject p = module[module.length-1].getProject();
@@ -75,20 +92,18 @@
return IServer.PUBLISH_STATE_UNKNOWN;
}
- if((kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
- int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
- if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
- monitor.beginTask("Publishing " + p.getName(), 200);
- EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
- EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
- monitor.done();
- return IServer.PUBLISH_STATE_NONE;
- } else if( changed == 0 && requestPushApproval(module)) {
- monitor.beginTask("Publishing " + p.getName(), 100);
- EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
- monitor.done();
- return IServer.PUBLISH_STATE_NONE;
- }
+ int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
+ if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
+ monitor.beginTask("Publishing " + p.getName(), 200);
+ EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
+ EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
+ monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
+ } else if( changed == 0 && requestPushApproval(module)) {
+ monitor.beginTask("Publishing " + p.getName(), 100);
+ EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
+ monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
}
return state;
}