JBoss Tools SVN: r38408 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-03 02:53:55 -0500 (Fri, 03 Feb 2012)
New Revision: 38408
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-10514 wooooot! simple easy
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-03 07:03:34 UTC (rev 38407)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-03 07:53:55 UTC (rev 38408)
@@ -218,7 +218,10 @@
}
public static URL getModuleRootURL(IModule module, String host, int port) {
-
+ return getModuleRootURL(module, host, port, false);
+ }
+
+ public static URL getModuleRootURL(IModule module, String host, int port, boolean ignoreContextRoot) {
if (module == null || module.loadAdapter(IWebModule.class,null)==null )
return null;
@@ -230,10 +233,11 @@
if (port != 80)
url += ":" + port; //$NON-NLS-1$
- String cxRoot = webModule.getContextRoot();
- if( !cxRoot.equals("/") && !cxRoot.equals("./")) //$NON-NLS-1$ //$NON-NLS-2$
- url += "/"+webModule.getContextRoot(); //$NON-NLS-1$
-
+ if( !ignoreContextRoot ) {
+ String cxRoot = webModule.getContextRoot();
+ if( !cxRoot.equals("/") && !cxRoot.equals("./")) //$NON-NLS-1$ //$NON-NLS-2$
+ url += "/"+webModule.getContextRoot(); //$NON-NLS-1$
+ }
if (!url.endsWith("/")) //$NON-NLS-1$
url += "/"; //$NON-NLS-1$
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-02-03 07:03:34 UTC (rev 38407)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-02-03 07:53:55 UTC (rev 38408)
@@ -77,6 +77,7 @@
@Override
public URL getModuleRootURL(IModule module) {
- return JBossServer.getModuleRootURL(module, getServer().getHost(), 80);
+ boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer());
+ return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 07:03:34 UTC (rev 38407)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 07:53:55 UTC (rev 38408)
@@ -53,6 +53,8 @@
public static final String ATTRIBUTE_REMOTE_NAME = "org.jboss.tools.openshift.express.internal.core.behaviour.RemoteName";
public static final String ATTRIBUTE_REMOTE_NAME_DEFAULT = "origin";
+ public static final String PREFERENCE_IGNORE_CONTEXT_ROOT = "org.jboss.tools.openshift.express.internal.core.behaviour.IgnoreContextRoot";
+
/** the OpensHift Server Type as defined in the plugin.xml.*/
public static final String OPENSHIFT_SERVER_TYPE = "org.jboss.tools.openshift.express.openshift.server.type";
@@ -144,6 +146,17 @@
}
+ public static boolean getIgnoresContextRoot(IServerAttributes server) {
+ return server.getAttribute(PREFERENCE_IGNORE_CONTEXT_ROOT, true);
+ }
+
+ public static IServer setIgnoresContextRoot(IServerAttributes server, boolean val) throws CoreException {
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(ATTRIBUTE_REMOTE_NAME, val);
+ return wc.save(false, new NullProgressMonitor());
+ }
+
+
/**
* To be used if you must create a local runtime adapter
* as the user does not have one in their workspace yet
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38407 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-03 02:03:34 -0500 (Fri, 03 Feb 2012)
New Revision: 38407
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java
Log:
Show in -> remote console needs to work for an as7 server in openshift binary mode
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-03 05:28:40 UTC (rev 38406)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-03 07:03:34 UTC (rev 38407)
@@ -286,6 +286,9 @@
return url;
}
+ /**
+ * @since 2.3
+ */
public static ArrayList<XPathCategory> loadDefaultPortQueries(IServer server, String baseDir) {
ArrayList<XPathCategory> retVal = new ArrayList<XPathCategory>();
URL url = rtToPortsFile.get(server.getRuntime().getRuntimeType().getId());
@@ -303,6 +306,9 @@
return retVal;
}
+ /**
+ * @since 2.3
+ */
public static void addQueriesToCategoryFromDefaultFile(IServer server, XPathCategory category,
String baseDir, URL url) throws IOException {
Properties pr = new Properties();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 05:28:40 UTC (rev 38406)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 07:03:34 UTC (rev 38407)
@@ -177,10 +177,6 @@
<instanceof
value="org.eclipse.wst.server.core.IServer">
</instanceof>
- <test
- forcePluginActivation="true"
- property="org.jboss.tools.openshift.express.isOpenShiftServer">
- </test>
</and>
</enablement>
</actionProvider>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 05:28:40 UTC (rev 38406)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 07:03:34 UTC (rev 38407)
@@ -20,8 +20,11 @@
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
@@ -279,4 +282,23 @@
return (OPENSHIFT_SERVER_TYPE.equals(serverTypeId));
}
+ /**
+ * Returns true if the given server is a server using an openshift behaviour
+ * @param server the server to check
+ * @return true or false
+ */
+ public static boolean isInOpenshiftBehaviourMode(IServer server) {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ if( ds != null ) {
+ IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server);
+ if( type != null ) {
+ String id = type.getId();
+ if( ExpressBinaryBehaviourDelegate.OPENSHIFT_BINARY_ID.equals(id) || ExpressBehaviourDelegate.OPENSHIFT_ID.equals(id))
+ return true;
+ }
+ }
+ return false;
+ }
+
+
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-03 05:28:40 UTC (rev 38406)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-03 07:03:34 UTC (rev 38407)
@@ -5,6 +5,10 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -70,22 +74,32 @@
@Override
public void run() {
final IServer server = getServer();
- if (ExpressServerUtils.isOpenShiftRuntime(server)) {
+ if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) {
MessageConsole console = ConsoleUtils.findMessageConsole(server.getId());
- String consoleName = console.getName();
- if (!this.consoleWorkers.containsKey(consoleName)) {
+ ConsoleUtils.displayConsoleView(console);
+ console.newMessageStream().println("Loading....");
+
+ if (!this.consoleWorkers.containsKey(console.getName())) {
+ launchTailServerJob(console, server);
+ }
+ }
+ }
+
+ private void launchTailServerJob(final MessageConsole console, final IServer server) {
+ new Job("Launching Tail Server Operation") {
+ protected IStatus run(IProgressMonitor monitor) {
try {
final TailServerLogWorker tailServerLogWorker = startTailProcess(server, console);
- consoleWorkers.put(consoleName, tailServerLogWorker);
consoleWorkers.put(console.getName(), tailServerLogWorker);
Thread thread = new Thread(tailServerLogWorker);
thread.start();
} catch (Exception e) {
Logger.error("Failed to retrieve remote server logs", e);
}
+ return Status.OK_STATUS;
}
- ConsoleUtils.displayConsoleView(console);
- }
+
+ }.schedule();
}
/**
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-03 05:28:40 UTC (rev 38406)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-03 07:03:34 UTC (rev 38407)
@@ -6,7 +6,9 @@
import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
public class TailServerLogActionProvider extends CommonActionProvider {
@@ -27,9 +29,14 @@
public void fillContextMenu(IMenuManager menu) {
if (action != null && action.isEnabled()) {
- //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action);
- CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite);
-
+ Object sel = getSelection();
+ if( sel instanceof IServer ) {
+ IServer server = (IServer)sel;
+ if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) {
+ //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action);
+ CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite);
+ }
+ }
}
}
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38406 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-03 00:28:40 -0500 (Fri, 03 Feb 2012)
New Revision: 38406
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyComboCommand.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyCommand.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
Log:
JBIDE-10480 and JBIDE-10543 for binary server impl woooohoo
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -199,7 +199,7 @@
/**
* @since 2.3
*/
- public static void storeInSecureStorage(IServer server, String key, String val ) {
+ public static void storeInSecureStorage(IServerAttributes server, String key, String val ) {
try {
ISecurePreferences node = getNode(server);
if( val == null )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1129,7 +1129,6 @@
point="org.jboss.ide.eclipse.as.core.behaviourExtension">
<behaviour
behaviourDelegate=""
- launchDelegate=""
name="Local"
publishMethod="org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod"
serverTypes="org.jboss.ide.eclipse.as.systemCopyServer"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2012-02-03 05:28:40 UTC (rev 38406)
@@ -4,6 +4,12 @@
<extension
point="org.jboss.ide.eclipse.as.core.behaviourExtension">
<behaviour
+ name="%RSEMethodName"
+ publishMethod="org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod"
+ serverTypes="org.jboss.ide.eclipse.as.systemCopyServer"
+ typeId="rse">
+ </behaviour>
+ <behaviour
behaviourDelegate="org.jboss.ide.eclipse.as.rse.core.RSEBehaviourDelegate"
launchDelegate="org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate"
name="%RSEMethodName"
@@ -11,9 +17,6 @@
serverTypes="%ServerTypesJBoss6OrLower"
typeId="rse">
</behaviour>
- </extension>
- <extension
- point="org.jboss.ide.eclipse.as.core.behaviourExtension">
<behaviour
behaviourDelegate="org.jboss.ide.eclipse.as.rse.core.RSEJBoss7BehaviourDelegate"
launchDelegate="org.jboss.ide.eclipse.as.rse.core.RSEJBoss7StartLaunchDelegate"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -13,7 +13,9 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
@@ -445,4 +447,10 @@
}
return null;
}
+
+ @Override
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ // TODO Auto-generated method stub
+
+ }
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ui.editor;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.TaskModel;
+import org.eclipse.wst.server.ui.editor.ServerEditorPart;
+import org.eclipse.wst.server.ui.editor.ServerEditorSection;
+import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput;
+import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager;
+import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+
+/**
+ * Provide utility methods to acquire a valid callback for
+ * use in either a new server wizard or inside a server editor
+ *
+ * @author rob.stryker
+ *
+ */
+public class DeploymentTypeUIUtil {
+
+ public interface ICompletable {
+ public void setComplete(boolean complete);
+ }
+
+ public static IServerModeUICallback getCallback(TaskModel tm, IWizardHandle handle, ICompletable completable) {
+ return new NewServerWizardBehaviourCallback(tm, handle, completable);
+ }
+
+ public static IServerModeUICallback getCallback(final IServerWorkingCopy server, IEditorInput input, ServerEditorPart part) {
+ return new ServerEditorUICallback(server, input, part);
+ }
+ public static IServerModeUICallback getCallback(final IServerWorkingCopy server, IEditorInput input, ServerEditorSection section) {
+ return new ServerEditorUICallback(server, input, section);
+ }
+
+
+ /**
+ * For use inside a wizard fragment
+ */
+ public static class NewServerWizardBehaviourCallback implements IServerModeUICallback {
+ protected TaskModel tm;
+ protected IWizardHandle handle;
+ protected ICompletable completable;
+ public NewServerWizardBehaviourCallback(TaskModel tm,
+ IWizardHandle handle, ICompletable completable) {
+ this.tm = tm;
+ this.handle = handle;
+ this.completable = completable;
+ }
+ public IRuntime getRuntime() {
+ return (IRuntime) tm.getObject(TaskModel.TASK_RUNTIME);
+ }
+ public IServerWorkingCopy getServer() {
+ return (IServerWorkingCopy) tm.getObject(TaskModel.TASK_SERVER);
+ }
+ public IWizardHandle getHandle() {
+ return handle;
+ }
+ public void execute(IUndoableOperation operation) {
+ try {
+ operation.execute(new NullProgressMonitor(), null);
+ } catch(ExecutionException ee) {
+ // TODO
+ }
+ }
+ public void executeLongRunning(Job j) {
+ // depends on COMMON, DAMN
+// IWizardContainer container = ((WizardPage)handle).getWizard().getContainer();
+// try {
+// WizardUtils.runInWizard(j, null, container);
+// } catch(Exception e) {
+// // TODO clean
+// }
+ j.schedule();
+ }
+ @Override
+ public void setErrorMessage(String msg) {
+ if( completable != null )
+ completable.setComplete(msg == null);
+ handle.setMessage(msg, IMessageProvider.ERROR);
+ handle.update();
+ }
+ }
+
+
+ /**
+ * For use inside a server editor
+ */
+ public static class ServerEditorUICallback implements IServerModeUICallback {
+ private IServerWorkingCopy server;
+ private ServerResourceCommandManager commandManager;
+ private ServerEditorPart part;
+ private ServerEditorSection section;
+ public ServerEditorUICallback(final IServerWorkingCopy server, IEditorInput input, ServerEditorPart part ) {
+ this.part = part;
+ this.server = server;
+ commandManager = ((ServerEditorPartInput) input).getServerCommandManager();
+ }
+ public ServerEditorUICallback(final IServerWorkingCopy server, IEditorInput input, ServerEditorSection section) {
+ this.section = section;
+ this.server = server;
+ commandManager = ((ServerEditorPartInput) input).getServerCommandManager();
+ }
+ public IServerWorkingCopy getServer() {
+ return server;
+ }
+ public void execute(IUndoableOperation operation) {
+ commandManager.execute(operation);
+ }
+ public IRuntime getRuntime() {
+ return server.getRuntime();
+ }
+ public void executeLongRunning(Job j) {
+ j.schedule();
+ }
+ public void setErrorMessage(String msg) {
+ if( part != null )
+ part.setErrorMessage(msg);
+ else
+ section.setErrorMessage(msg);
+ }
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -11,6 +11,9 @@
package org.jboss.ide.eclipse.as.ui.editor;
import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -21,6 +24,8 @@
public IServerWorkingCopy getServer();
public IRuntime getRuntime();
public void execute(IUndoableOperation operation);
+ public void executeLongRunning(Job j);
+ public void setErrorMessage(String msg);
}
/**
@@ -37,4 +42,10 @@
* @param modeSection
*/
public void fillComposite(Composite parent, IServerModeUICallback callback);
+
+ /**
+ * Allow the mode composite to take some action on finish
+ * @since 2.3
+ */
+ public void performFinish(IProgressMonitor monitor) throws CoreException;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSection.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.ui.editor;
-import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -20,48 +19,25 @@
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
import org.eclipse.wst.server.ui.editor.ServerEditorSection;
-import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput;
-import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
public class ServerModeSection extends ServerEditorSection {
private IServerModeUICallback callback = null;
- private ServerResourceCommandManager commandManager;
-
+ private IEditorInput input;
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
- if (input instanceof IServerEditorPartInput) {
- IServerEditorPartInput sepi = (IServerEditorPartInput) input;
- server = sepi.getServer();
- commandManager = ((ServerEditorPartInput) sepi).getServerCommandManager();
- }
+ this.input = input;
}
- public ServerResourceCommandManager getCommandManager() {
- return commandManager;
- }
-
public IServerWorkingCopy getServer() {
return server;
}
private IServerModeUICallback getUICallback() {
if( callback == null ) {
- callback = new IServerModeUICallback(){
- public IServerWorkingCopy getServer() {
- return server;
- }
- public void execute(IUndoableOperation operation) {
- getCommandManager().execute(operation);
- }
- public IRuntime getRuntime() {
- return server.getRuntime();
- }
- };
+ callback = DeploymentTypeUIUtil.getCallback(server, input, this);
}
return callback;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2012 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,
@@ -52,6 +52,8 @@
private Button executeShellScripts; // may be null;
private Button listenOnAllHosts; // may be null
+ private DeployUIAdditions currentUIAddition;
+
public ServerModeSectionComposite(Composite parent, int style, IServerModeUICallback callback) {
super(parent, style);
this.callback = callback;
@@ -99,8 +101,9 @@
preferencePageBook = toolkit.createPageBook(this, SWT.FLAT|SWT.TOP);
+
preferencePageBook.setLayoutData(UIUtil.createFormData2(
- deployTypeCombo, 5, 0, 200, 0, 5, 100, -5));
+ deployTypeCombo, 5, 0, 300, 0, 5, 100, -5));
// fill widgets
String[] nameList = new String[deployAdditions.size()];
@@ -114,10 +117,10 @@
Behaviour b = BehaviourModel.getModel().getBehaviour(callback.getServer().getOriginal().getServerType().getId());
String behaviourType = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(
callback.getServer().getOriginal(), getDefaultServerMode());
- current = b.getImpl(behaviourType).getName();
+ if( b.getImpl(behaviourType) != null )
+ current = b.getImpl(behaviourType).getName();
} else {
String host = callback.getServer().getHost();
-// IJBossServerPublishMethodType behType = null;
BehaviourImpl impl = null;
String serverTypeId = callback.getServer().getServerType().getId();
if( SocketUtil.isLocalhost(host)) {
@@ -143,6 +146,10 @@
deployTypeChanged(false);
}
+ public IDeploymentTypeUI getCurrentBehaviourUI() {
+ return currentUIAddition.getUI();
+ }
+
protected String getDefaultServerMode() {
return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
}
@@ -184,7 +191,9 @@
this.behaviourId = id;
this.ui = ui;
}
-
+ public IDeploymentTypeUI getUI() {
+ return ui;
+ }
public boolean isRegistered() {
return registered;
}
@@ -216,6 +225,7 @@
int index = deployTypeCombo.getSelectionIndex();
if( index != -1 ) {
DeployUIAdditions ui = deployAdditions.get(index);
+ currentUIAddition = ui;
if( !ui.isRegistered()) {
Composite newRoot = preferencePageBook.createPage(ui);
ui.createComposite(newRoot);
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyComboCommand.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyComboCommand.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyComboCommand.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ui.editor;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.ui.internal.command.ServerCommand;
+/**
+ * @since 2.3
+ */
+public class ServerWorkingCopyPropertyComboCommand extends ServerCommand {
+ protected String oldVal;
+ protected String newVal;
+ protected String key;
+ protected Combo combo;
+ protected ModifyListener listener;
+ protected IServerWorkingCopy wc;
+
+ public ServerWorkingCopyPropertyComboCommand(IServerWorkingCopy wc, String commandName,
+ Combo combo, String newVal, String attributeKey, ModifyListener listener) {
+ super(wc, commandName);
+ this.wc = wc;
+ this.combo = combo;
+ this.key = attributeKey;
+ this.newVal = newVal;
+ this.listener = listener;
+ if( key != null )
+ this.oldVal = wc.getAttribute(attributeKey, ""); //$NON-NLS-1$
+ }
+
+ public void execute() {
+ wc.setAttribute(key, newVal);
+ }
+
+ public void undo() {
+ if( listener != null )
+ combo.removeModifyListener(listener);
+ wc.setAttribute(key, oldVal);
+ if( combo != null && !combo.isDisposed())
+ combo.setText(oldVal);
+ if( listener != null )
+ combo.addModifyListener(listener);
+ }
+}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyCommand.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyCommand.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerWorkingCopyPropertyCommand.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -16,8 +16,7 @@
protected IServerWorkingCopy wc;
public ServerWorkingCopyPropertyCommand(IServerWorkingCopy wc, String commandName,
- Text text, String newVal, String attributeKey,
- ModifyListener listener) {
+ Text text, String newVal, String attributeKey, ModifyListener listener) {
super(wc, commandName);
this.wc = wc;
this.text = text;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2012 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,
@@ -11,8 +11,6 @@
package org.jboss.ide.eclipse.as.ui.wizards;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -40,7 +38,9 @@
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.UIUtil;
-import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil.ICompletable;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite;
/**
@@ -48,7 +48,7 @@
* @author Rob Stryker <rob.stryker(a)redhat.com>
*
*/
-public class JBossServerWizardFragment extends WizardFragment {
+public class JBossServerWizardFragment extends WizardFragment implements ICompletable {
private IWizardHandle handle;
private Label serverExplanationLabel,
runtimeExplanationLabel;
@@ -56,11 +56,14 @@
private Label homeValLabel, execEnvironmentValLabel, jreValLabel, configValLabel, configLocValLabel;
private Group runtimeGroup;
+ private ServerModeSectionComposite modeComposite;
public JBossServerWizardFragment() {
super();
}
-
+ public void setComplete(boolean complete) {
+ super.setComplete(complete);
+ }
public Composite createComposite(Composite parent, IWizardHandle handle) {
this.handle = handle;
// make modifications to parent
@@ -173,24 +176,10 @@
g.setLayoutData(groupData);
g.setLayout(new FillLayout());
- new ServerModeSectionComposite(g, SWT.NONE, new NewServerWizardBehaviourCallback());
+ modeComposite = new ServerModeSectionComposite(g, SWT.NONE,
+ DeploymentTypeUIUtil.getCallback(getTaskModel(), handle, this));
}
- private class NewServerWizardBehaviourCallback implements IServerModeUICallback {
- public IRuntime getRuntime() {
- return (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- }
- public IServerWorkingCopy getServer() {
- return (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
- }
- public void execute(IUndoableOperation operation) {
- try {
- operation.execute(new NullProgressMonitor(), null);
- } catch(ExecutionException ee) {
- // TODO
- }
- }
- }
private void updateErrorMessage() {
String error = getErrorString();
@@ -231,6 +220,9 @@
IServerWorkingCopy serverWC = (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
serverWC.setServerConfiguration(null); // no inside jboss folder
+ IDeploymentTypeUI ui = modeComposite.getCurrentBehaviourUI();
+ if( ui != null )
+ ui.performFinish(monitor);
}
private IJBossServerRuntime getRuntime() {
@@ -246,7 +238,7 @@
}
public boolean isComplete() {
- return getErrorString() == null ? true : false;
+ return super.isComplete();
}
public boolean hasComposite() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -361,6 +361,22 @@
return op.getCommit();
}
+ public static List<URIish> getRemoteURIs(IProject p) throws CoreException {
+ RemoteConfig rc = getRemoteConfig(p);
+ if( rc != null ) {
+ return rc.getURIs();
+ }
+ return new ArrayList<URIish>();
+ }
+
+ public static RemoteConfig getRemoteConfig(IProject project) throws CoreException {
+ Repository rep = getRepository(project);
+ if( rep != null ) {
+ return getRemoteConfig(rep);
+ }
+ return null;
+ }
+
/**
* Pushes the current branch of the given repository to the remote
* repository that it originates from.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-03 05:28:40 UTC (rev 38406)
@@ -37,7 +37,8 @@
org.eclipse.core.expressions;bundle-version="3.4.300",
org.eclipse.wst.common.modulecore;bundle-version="1.2.101",
org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.3.0",
- org.eclipse.ui.forms;bundle-version="3.5.100"
+ org.eclipse.ui.forms;bundle-version="3.5.100",
+ org.jboss.ide.eclipse.archives.webtools;bundle-version="2.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 05:28:40 UTC (rev 38406)
@@ -71,6 +71,14 @@
serverTypes="org.jboss.tools.openshift.express.openshift.server.type"
typeId="openshift">
</behaviour>
+ <behaviour
+ behaviourDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBinaryBehaviourDelegate"
+ launchDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressLaunchDelegate"
+ name="Openshift Binary"
+ publishMethod="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBinaryPublishMethod"
+ serverTypes="org.jboss.ide.eclipse.as.70"
+ typeId="openshiftBinary">
+ </behaviour>
</extension>
<extension
@@ -271,4 +279,16 @@
typeIds="org.jboss.tools.openshift.express.openshift.server.type">
</fragment>
</extension>
+
+
+
+
+ <!-- Openshift Binary -->
+ <extension
+ point="org.jboss.ide.eclipse.as.ui.DeployMethodUI">
+ <ui class="org.jboss.tools.openshift.express.internal.ui.behaviour.ExpressBinaryUI"
+ deployMethodId="openshiftBinary">
+ </ui>
+ </extension>
+
</plugin>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc..
+ * Copyright (c) 2012 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
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.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.AbstractBehaviourDelegate;
+
+public class ExpressBinaryBehaviourDelegate extends AbstractBehaviourDelegate {
+
+ public static final String OPENSHIFT_BINARY_ID = "openshiftBinary";
+ public ExpressBinaryBehaviourDelegate() {
+ // TODO Auto-generated constructor stub
+ }
+ @Override
+ public String getBehaviourTypeId() {
+ return OPENSHIFT_BINARY_ID;
+ }
+
+ @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 IStatus canChangeState(String launchMode) {
+ // TODO Auto-generated method stub
+ return Status.OK_STATUS;
+ }
+
+
+}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.tools.openshift.express.internal.core.behaviour;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
+import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+
+public class ExpressBinaryPublishMethod extends ExpressPublishMethod {
+
+ @Override
+ public int publishFinish(DeployableServerBehavior behaviour,
+ IProgressMonitor monitor) throws CoreException {
+
+ String outProject = ExpressServerUtils.getExpressDeployProject(behaviour.getServer());
+ if( outProject != null ) {
+ final IProject destProj = ResourcesPlugin.getWorkspace().getRoot().getProject(outProject);
+ if( destProj.exists() ) {
+ refreshProject(destProj);
+ commitAndPushProject(destProj, behaviour, monitor);
+ }
+ }
+
+ return areAllPublished(behaviour) ? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_INCREMENTAL;
+ }
+
+ private void refreshProject(final IProject project) throws CoreException {
+ // Already inside a workspace scheduling rule
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ @Override
+ public int publishModule(DeployableServerBehavior behaviour, int kind,
+ int deltaKind, IModule[] module, IProgressMonitor monitor)
+ throws CoreException {
+ if( module.length > 1 )
+ return 0;
+
+ IDeployableServer depServ = ServerConverter.getDeployableServer(behaviour.getServer());
+ IPath dest = PublishUtil.getDeployRootFolder(module, depServ);
+ //PublishUtil.getDeployPath(this, module, depServ);
+
+ if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE;
+ int modulePublishState = behaviour.getServer().getModulePublishState(module);
+ int publishType = behaviour.getPublishType(kind, deltaKind, modulePublishState);
+
+ IModuleResourceDelta[] delta = new IModuleResourceDelta[]{};
+ if( deltaKind != ServerBehaviourDelegate.REMOVED)
+ delta = behaviour.getPublishedResourceDelta(module);
+
+
+ LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
+ IStatus status = util.publishModule(behaviour.getServer(), dest.toString(), module, publishType, delta, monitor);
+ monitor.done();
+ return 0;
+ }
+
+ @Override
+ public String getPublishDefaultRootFolder(IServer server) {
+ IDeployableServer s = ServerConverter.getDeployableServer(server);
+ return s.getDeployFolder();
+ }
+
+}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -27,13 +27,11 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.internal.ui.wizards.ConfigureProjectWizard;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.navigator.filters.CoreExpressionFilter;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
-import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils;
@@ -61,14 +59,18 @@
shareProjects(projects);
projectsLackingGitRepo = null;
}
+ return areAllPublished(behaviour) ? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_INCREMENTAL;
+ }
+
+ protected boolean areAllPublished(DeployableServerBehavior behaviour) {
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;
- }
+ return allpublished;
+ }
@Override
public int publishModule(DeployableServerBehavior behaviour, int kind,
@@ -98,19 +100,28 @@
return IServer.PUBLISH_STATE_UNKNOWN;
}
+ commitAndPushProject(p, behaviour, monitor);
+
+ return IServer.PUBLISH_STATE_NONE;
+ }
+
+ protected PushOperationResult commitAndPushProject(IProject p,
+ DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException {
+ Repository repository = EGitUtils.getRepository(p);
+
int changed = EGitUtils.countCommitableChanges(p, behaviour.getServer(), new NullProgressMonitor() );
String remoteName = behaviour.getServer().getAttribute(ExpressServerUtils.ATTRIBUTE_REMOTE_NAME,
ExpressServerUtils.ATTRIBUTE_REMOTE_NAME_DEFAULT);
PushOperationResult result = null;
boolean committed = false;
try {
- if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
+ if( changed != 0 && requestCommitAndPushApproval(p.getName(), changed)) {
monitor.beginTask("Publishing " + p.getName(), 300);
EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
committed = true;
}
- if( committed || (changed == 0 && requestPushApproval(module))) {
+ if( committed || (changed == 0 && requestPushApproval(p.getName()))) {
if( !committed )
monitor.beginTask("Publishing " + p.getName(), 200);
result = EGitUtils.push(remoteName, EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
@@ -131,10 +142,10 @@
if( result != null ) {
ConsoleUtils.appendGitPushToConsole(behaviour.getServer(), result);
}
-
- return IServer.PUBLISH_STATE_NONE;
+ return result;
}
-
+
+
private void shareProjects(final IProject[] projects) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
@@ -150,21 +161,23 @@
});
}
- private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
- String projName = module[module.length-1].getProject().getName();
+ protected String getModuleProjectName(IModule[] module) {
+ return module[module.length-1].getProject().getName();
+ }
+
+ protected boolean requestCommitAndPushApproval(String projName, int changed) {
String msg = NLS.bind(ExpressMessages.requestCommitAndPushMsg, changed, projName);
String title = NLS.bind(ExpressMessages.requestCommitAndPushTitle, projName);
return requestApproval(msg, title);
}
- private boolean requestPushApproval(final IModule[] module) {
- String projName = module[module.length-1].getProject().getName();
+ protected boolean requestPushApproval(String projName) {
String msg = NLS.bind(ExpressMessages.requestPushMsg, projName);
String title = NLS.bind(ExpressMessages.requestPushTitle, projName);
return requestApproval(msg, title);
}
- private boolean requestApproval(final String message, final String title) {
+ protected boolean requestApproval(final String message, final String title) {
final boolean[] b = new boolean[1];
Display.getDefault().syncExec(new Runnable() {
public void run() {
@@ -174,7 +187,7 @@
return b[0];
}
- private static Shell getActiveShell() {
+ protected static Shell getActiveShell() {
Display display = Display.getDefault();
final Shell[] ret = new Shell[1];
display.syncExec(new Runnable() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc..
+ * Copyright (c) 2012 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
@@ -42,6 +42,7 @@
public static final String EXPRESS_SOURCE_MODE = "publishSource";
public static final String ATTRIBUTE_APPLICATION_NAME = "org.jboss.tools.openshift.express.internal.core.behaviour.ApplicationName";
public static final String ATTRIBUTE_APPLICATION_ID = "org.jboss.tools.openshift.express.internal.core.behaviour.ApplicationId";
+ public static final String ATTRIBUTE_DEPLOY_PROJECT = "org.jboss.tools.openshift.express.internal.core.behaviour.binary.deployProject";
public static final String ATTRIBUTE_DOMAIN = "org.jboss.tools.openshift.express.internal.core.behaviour.Domain";
public static final String ATTRIBUTE_USERNAME = "org.jboss.tools.openshift.express.internal.core.behaviour.Username";
// Legacy, not to be used
@@ -72,18 +73,26 @@
public static String getExpressApplicationName(IServerAttributes attributes ) {
return attributes.getAttribute(ATTRIBUTE_APPLICATION_NAME, (String)null);
}
-
- public static String getExpressApplicationId(IServerAttributes attributes ) {
- return attributes.getAttribute(ATTRIBUTE_APPLICATION_ID, (String)null);
- }
-
+
public static IServer setExpressApplication(IServer server, String val) throws CoreException {
IServerWorkingCopy wc = server.createWorkingCopy();
wc.setAttribute(ATTRIBUTE_APPLICATION_NAME, val);
return wc.save(false, new NullProgressMonitor());
}
+ public static String getExpressDeployProject(IServerAttributes attributes ) {
+ return attributes.getAttribute(ATTRIBUTE_DEPLOY_PROJECT, (String)null);
+ }
+ public static IServer setExpressDeployProject(IServer server, String val) throws CoreException {
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(ATTRIBUTE_DEPLOY_PROJECT, val);
+ return wc.save(false, new NullProgressMonitor());
+ }
+ public static String getExpressApplicationId(IServerAttributes attributes ) {
+ return attributes.getAttribute(ATTRIBUTE_APPLICATION_ID, (String)null);
+ }
+
public static String getExpressDomain(IServerAttributes attributes ) {
return attributes.getAttribute(ATTRIBUTE_DOMAIN, (String)null);
}
@@ -119,15 +128,16 @@
}
public static String getExpressPassword(IServer server ) {
+ if( server == null )
+ return null;
String s = ServerUtil.getFromSecureStorage(server, ExpressServerUtils.ATTRIBUTE_PASSWORD);
if( s == null )
return server.getAttribute(ExpressServerUtils.ATTRIBUTE_PASSWORD, (String)null);
return s;
}
- public static IServer setExpressPassword(IServer server, String val) throws CoreException {
+ public static void setExpressPassword(IServerAttributes server, String val) throws CoreException {
ServerUtil.storeInSecureStorage(server, ExpressServerUtils.ATTRIBUTE_PASSWORD, val);
- return server;
}
@@ -226,7 +236,12 @@
if( host.endsWith("/"))
host = host.substring(0, host.length()-1);
wc.setHost(host);
- wc.setAttribute(IDeployableServer.SERVER_MODE, "openshift");
+ if(mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE)) {
+ wc.setAttribute(IDeployableServer.SERVER_MODE, ExpressBehaviourDelegate.OPENSHIFT_ID);
+ } else {
+ wc.setAttribute(IDeployableServer.SERVER_MODE, ExpressBinaryBehaviourDelegate.OPENSHIFT_BINARY_ID);
+
+ }
wc.setAttribute(ATTRIBUTE_USERNAME, username);
wc.setAttribute(ATTRIBUTE_DOMAIN, domain);
wc.setAttribute(ATTRIBUTE_APPLICATION_NAME, appName);
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ui.behaviour;
+
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+
+public class ExpressBinaryUI implements IDeploymentTypeUI {
+ private ExpressDetailsComposite composite;
+ private IServerModeUICallback wrapped;
+ public ExpressBinaryUI() {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public void fillComposite(Composite parent, IServerModeUICallback callback) {
+ parent.setLayout(new FillLayout());
+ wrapped = wrapCallback(callback);
+
+ composite = ExpressDetailsComposite.createComposite(parent,wrapped,
+ ExpressServerUtils.EXPRESS_BINARY_MODE, true);
+ }
+
+ private IServerModeUICallback wrapCallback(final IServerModeUICallback inner) {
+ return new IServerModeUICallback() {
+ public IServerWorkingCopy getServer() {
+ return inner.getServer();
+ }
+ public IRuntime getRuntime() {
+ return inner.getRuntime();
+ }
+ public void execute(IUndoableOperation operation) {
+ inner.execute(operation);
+ }
+ public void executeLongRunning(Job j) {
+ if( inner instanceof DeploymentTypeUIUtil.NewServerWizardBehaviourCallback) {
+ IWizardHandle handle = ((DeploymentTypeUIUtil.NewServerWizardBehaviourCallback)inner).getHandle();
+ // depends on COMMON, DAMN
+ IWizardContainer container = ((WizardPage)handle).getWizard().getContainer();
+ try {
+ WizardUtils.runInWizard(j, null, container);
+ } catch(Exception e) {
+ // TODO clean
+ }
+ } else {
+ inner.executeLongRunning(j);
+ }
+ }
+ public void setErrorMessage(String msg) {
+ inner.setErrorMessage(msg);
+ }
+ };
+ }
+
+ @Override
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ ExpressServerUtils.setExpressPassword(wrapped.getServer(), composite.getPassword());
+ }
+
+}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -0,0 +1,408 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ui.behaviour;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+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.core.runtime.jobs.Job;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jgit.transport.URIish;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyComboCommand;
+import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyCommand;
+import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftApplicationWizardModel;
+import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPageModel;
+
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftException;
+
+public class ExpressDetailsComposite {
+ public static ExpressDetailsComposite createComposite(Composite parent,
+ IServerModeUICallback callback, String mode, boolean showVerify) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+ return new ExpressDetailsComposite(composite, callback, mode, showVerify);
+ }
+
+ protected IServerModeUICallback callback;
+ private ModifyListener nameModifyListener, remoteModifyListener,
+ passModifyListener, appModifyListener, deployProjectModifyListener;
+ protected Text userText, passText, remoteText;
+ protected Combo appNameCombo, deployProjectCombo;
+ protected Button verifyButton;
+ protected boolean showVerify;
+ private Composite composite;
+ private String user, pass, app, remote, deployProject;
+ private IApplication fapplication;
+ private IUser fuser;
+ private String[] appListNames;
+ private String error;
+ private IServerWorkingCopy server;
+ private String mode;
+ public ExpressDetailsComposite(Composite fill, IServerModeUICallback callback, String mode, boolean showVerify) {
+ this.callback = callback;
+ this.server = callback.getServer();
+ this.mode = mode;
+ this.composite = fill;
+ this.showVerify = showVerify;
+ fillSection(fill);
+ addListeners();
+ }
+
+ public Composite getComposite() {
+ return composite;
+ }
+
+ public String getPassword() {
+ return pass;
+ }
+
+ private void fillSection(Composite composite) {
+ composite.setLayout(new GridLayout(2, false));
+ Label userLabel = new Label(composite, SWT.NONE);
+ userText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+ GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(userText);
+ Label passLabel = new Label(composite, SWT.NONE);
+ passText = new Text(composite, SWT.PASSWORD | SWT.BORDER);
+ GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText);
+
+ if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) {
+ Label appNameLabel = new Label(composite, SWT.NONE);
+ appNameCombo = new Combo(composite, SWT.NONE);
+ appNameLabel.setText("Application Name: " );
+ String aName = ExpressServerUtils.getExpressApplicationName(server);
+ if( aName != null ) appNameCombo.setText(aName);
+ if( aName != null ) appNameCombo.setEnabled(false);
+ } else {
+ Label deployLocationLabel = new Label(composite, SWT.NONE);
+ deployProjectCombo = new Combo(composite, SWT.NONE);
+ deployLocationLabel.setText("Openshift Project: " );
+ String[] projectNames = discoverOpenshiftProjects();
+ deployProjectCombo.setItems(projectNames);
+ String depLoc = ExpressServerUtils.getExpressDeployProject(server);
+ if( depLoc != null ) deployProjectCombo.setText(depLoc);
+ if( depLoc != null ) deployProjectCombo.setEnabled(false);
+ }
+
+ Label remoteLabel = new Label(composite, SWT.NONE);
+ remoteText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+ GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(remoteText);
+
+
+ // Text
+ userLabel.setText("Username: ");
+ passLabel.setText("Password: ");
+ remoteLabel.setText("Remote: ");
+ remoteText.setText(AbstractOpenShiftApplicationWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
+
+ String n = ExpressServerUtils.getExpressUsername(server);
+ String p = ExpressServerUtils.getExpressPassword(server.getOriginal());
+ String remote = ExpressServerUtils.getExpressRemoteName(server);
+ if( n != null ) userText.setText(n);
+ if( p != null ) passText.setText(p);
+ if( remote != null ) remoteText.setText(remote);
+
+ if( showVerify ) {
+ verifyButton = new Button(composite, SWT.PUSH);
+ verifyButton.setText("Verify...");
+ }
+ }
+
+ private String[] discoverOpenshiftProjects() {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ ArrayList<String> names = new ArrayList<String>();
+ for( int i = 0; i < projects.length; i++ ) {
+ if( isOpenshiftProjectWithDeploymentsFolder(projects[i])) {
+ names.add(projects[i].getName());
+ }
+ }
+ return (String[]) names.toArray(new String[names.size()]);
+ }
+
+ private boolean isOpenshiftProjectWithDeploymentsFolder(IProject p) {
+ // TODO add other criteria?
+ IFolder f = p.getFolder(".openshift");
+ if( f != null && f.exists()) {
+ return true;
+ }
+ return false;
+ }
+
+ private void addListeners() {
+ nameModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ user = userText.getText();
+ callback.execute(new SetUserCommand(server));
+ }
+ };
+ userText.addModifyListener(nameModifyListener);
+
+ passModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ //pass = passText.getText();
+ callback.execute(new SetPassCommand(server));
+ }
+ };
+ passText.addModifyListener(passModifyListener);
+
+ remoteModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ remote = remoteText.getText();
+ callback.execute(new SetRemoteCommand(server));
+ }
+ };
+ remoteText.addModifyListener(remoteModifyListener);
+
+ if( appNameCombo != null ) {
+ appModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ app = appNameCombo.getText();
+ callback.execute(new SetApplicationCommand(server));
+ }
+ };
+ appNameCombo.addModifyListener(appModifyListener);
+ }
+
+ if( deployProjectCombo != null ) {
+ deployProjectModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ deployProject = deployProjectCombo.getText();
+ callback.execute(new SetDeployProjectCommand(server));
+ }
+ };
+ deployProjectCombo.addModifyListener(deployProjectModifyListener);
+ }
+
+ if( verifyButton != null ) {
+ verifyButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ verifyPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+ }
+
+ private void verifyPressed() {
+ final CredentialsWizardPageModel model = new CredentialsWizardPageModel(null);
+ this.fapplication = null;
+ this.fuser = null;
+ this.appListNames = null;
+ model.setPassword(pass);
+ model.setRhLogin(user);
+ verifyButton.setEnabled(false);
+ final Runnable runnable = getVerifyingCredentialsJob(model);
+ Job j = new Job("Verifying Credentials and Application") {
+ protected IStatus run(IProgressMonitor monitor) {
+ runnable.run();
+ return Status.OK_STATUS;
+ }
+ };
+ callback.executeLongRunning(j);
+ postLongRunningValidate();
+ }
+
+ private void postLongRunningValidate() {
+ if( appListNames == null ) {
+ appListNames = new String[0];
+ }
+ if( appNameCombo != null ) {
+ int index = Arrays.asList(appListNames).indexOf(app);
+ appNameCombo.setItems(appListNames);
+ if( index != -1 )
+ appNameCombo.select(index);
+ }
+ callback.setErrorMessage(error);
+ verifyButton.setEnabled(true);
+ }
+
+
+ public class SetUserCommand extends ServerWorkingCopyPropertyCommand {
+ public SetUserCommand(IServerWorkingCopy server) {
+ super(server, Messages.EditorChangeUsernameCommandName, userText, userText.getText(),
+ ExpressServerUtils.ATTRIBUTE_USERNAME, nameModifyListener);
+ }
+ }
+
+ public class SetRemoteCommand extends ServerWorkingCopyPropertyCommand {
+ public SetRemoteCommand(IServerWorkingCopy server) {
+ super(server, "Change Remote Name", remoteText, remoteText.getText(),
+ ExpressServerUtils.ATTRIBUTE_REMOTE_NAME, remoteModifyListener);
+ }
+ }
+
+ public class SetApplicationCommand extends ServerWorkingCopyPropertyComboCommand {
+ public SetApplicationCommand(IServerWorkingCopy server) {
+ super(server, "Change Application Name", appNameCombo, appNameCombo.getText(),
+ ExpressServerUtils.ATTRIBUTE_APPLICATION_NAME, appModifyListener);
+ }
+ }
+
+ public class SetDeployProjectCommand extends ServerWorkingCopyPropertyComboCommand {
+ public SetDeployProjectCommand(IServerWorkingCopy server) {
+ super(server, "Change Deployment Project", appNameCombo, deployProjectCombo.getText(),
+ ExpressServerUtils.ATTRIBUTE_DEPLOY_PROJECT, deployProjectModifyListener);
+ }
+ }
+
+ public class SetPassCommand extends ServerWorkingCopyPropertyCommand {
+ public SetPassCommand(IServerWorkingCopy server) {
+ super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
+ IJBossToolingConstants.SERVER_PASSWORD, passModifyListener);
+ oldVal = passText.getText();
+ }
+
+ public void execute() {
+ pass = newVal;
+ }
+
+ public void undo() {
+ pass = oldVal;
+ text.removeModifyListener(listener);
+ text.setText(oldVal);
+ text.addModifyListener(listener);
+ }
+ }
+
+ private Runnable getVerifyingCredentialsJob(final CredentialsWizardPageModel model) {
+ return new Runnable() {
+ public void run() {
+ final IStatus s = model.validateCredentials();
+ String error = null;
+ if( !s.isOK() ) {
+ error = "Credentials Failed";
+ } else {
+
+ if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) {
+ verifyApplicationSourceMode(model);
+ } else {
+ verifyApplicationBinaryMode(model);
+ }
+ }
+ ExpressDetailsComposite.this.error = error;
+ }
+ };
+ }
+
+ private IApplication findApplicationForProject(IProject p, List<IApplication> applications)
+ throws OpenShiftException, CoreException {
+ List<URIish> uris = EGitUtils.getRemoteURIs(p);
+ Iterator<IApplication> i = applications.iterator();
+ while(i.hasNext()) {
+ IApplication a = i.next();
+ String gitUri = a.getGitUri();
+ Iterator<URIish> j = uris.iterator();
+ while(j.hasNext()) {
+ String projUri = j.next().toPrivateString();
+ if( projUri.equals(gitUri)) {
+ return a;
+ }
+ }
+ }
+ return null;
+ }
+
+ private void verifyApplicationBinaryMode(CredentialsWizardPageModel model) {
+ System.out.println(deployProject);
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(deployProject);
+ try {
+ final List<IApplication> allApps = model.getUser().getApplications();
+ fapplication = findApplicationForProject(p, allApps);
+ fuser = model.getUser();
+
+ if( fapplication == null ) {
+ error = "Application for project \"" + p.getName() + "\" not found";
+ }
+ IServerWorkingCopy wc = callback.getServer();
+ ExpressServerUtils.fillServerWithOpenShiftDetails(wc, fapplication, fuser,
+ mode, remote);
+ wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
+ wc.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
+ wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ } catch( OpenShiftException ce ) {
+
+ } catch( CoreException ce) {
+
+ }
+ }
+
+ private void verifyApplicationSourceMode(CredentialsWizardPageModel model) {
+ // now check the app name and cartridge
+ String[] appNames = new String[]{};
+ try {
+ final List<IApplication> allApps = model.getUser().getApplications();
+ appNames = getAppNamesAsStrings(allApps);
+ int index = Arrays.asList(appNames).indexOf(app);
+ IApplication application = index == -1 ? null : allApps.get(index);
+ ExpressDetailsComposite.this.appListNames = appNames;
+ if( application == null ) {
+ error = "Application " + app + " not found";
+ } else {
+ // Fill with new data
+ try {
+ ExpressDetailsComposite.this.fapplication = application;
+ ExpressDetailsComposite.this.fuser = model.getUser();
+
+ // update the values
+ IServerWorkingCopy wc = callback.getServer();
+ ExpressServerUtils.fillServerWithOpenShiftDetails(wc, application, fuser,
+ mode, remote);
+ } catch(CoreException ce) {
+ // TODO FIX HANDLE
+ }
+ }
+ } catch(OpenShiftException ose) {
+ error = "Application \"" + app + "\" not found: " + ose.getMessage();
+ }
+ }
+
+
+
+ private String[] getAppNamesAsStrings(List<IApplication> allApps) {
+ String[] appNames = new String[allApps.size()];
+ for( int i = 0; i < allApps.size(); i++ ) {
+ appNames[i] = allApps.get(i).getName();
+ }
+ return appNames;
+ }
+
+
+}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -12,30 +12,25 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.IFormColors;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.editor.ServerEditorSection;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
-import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyCommand;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
public class ExpressDetailsSection extends ServerEditorSection {
- private ModifyListener nameModifyListener, remoteModifyListener, passModifyListener;
- private Text nameText, passText, remoteText;
- private ServerAttributeHelper helper;
-
- private String passwordString;
+ private ExpressDetailsComposite details;
+ private IEditorInput input;
+ public void init(IEditorSite site, IEditorInput input) {
+ super.init(site, input);
+ this.input = input;
+ }
public void createSection(Composite parent) {
super.createSection(parent);
@@ -44,109 +39,24 @@
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
section.setText("Express Server in Source Mode (Details)");
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
- Composite composite = toolkit.createComposite(section);
- composite.setLayout(new GridLayout(2, false));
- fillSection(composite, toolkit);
- addListeners();
-
- toolkit.paintBordersFor(composite);
- section.setClient(composite);
+ details = ExpressDetailsComposite.createComposite(section, createCallback(), ExpressServerUtils.EXPRESS_SOURCE_MODE, false);
+ toolkit.paintBordersFor(details.getComposite());
+ section.setClient(details.getComposite());
+ details.appNameCombo.setEnabled(false);
}
- private void fillSection(Composite composite, FormToolkit toolkit) {
-
- GridData d = new GridData(); d.horizontalSpan = 2;
-
- Label appName = toolkit.createLabel(composite, "Application Name");
- Label appNameVal = toolkit.createLabel(composite, ExpressServerUtils.getExpressApplicationName(server));
- Label appId = toolkit.createLabel(composite, "Application Id");
- Label appIdVal = toolkit.createLabel(composite, ExpressServerUtils.getExpressApplicationId(server));
-
- Label username = toolkit.createLabel(composite, Messages.swf_Username);
- username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- String n = ExpressServerUtils.getExpressUsername(server);
- nameText = toolkit.createText(composite, n);
- String p = ExpressServerUtils.getExpressPassword(server.getOriginal());
- Label password = toolkit.createLabel(composite, Messages.swf_Password);
- password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- passText = toolkit.createText(composite, p);
- passwordString = p;
- String remote = ExpressServerUtils.getExpressRemoteName(server);
- Label remoteName = toolkit.createLabel(composite, "Remote Name");
- remoteName.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- remoteText = toolkit.createText(composite, remote);
-
- d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100;
- nameText.setLayoutData(d);
- d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100;
- passText.setLayoutData(d);
-
+ private IServerModeUICallback createCallback() {
+ return DeploymentTypeUIUtil.getCallback(server, input, this);
}
-
- private void addListeners() {
- nameModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- execute(new SetUserCommand(server));
- }
- };
- remoteModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- execute(new SetRemoteCommand(server));
- }
- };
-
- passModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- execute(new SetPassCommand(server));
- }
- };
- nameText.addModifyListener(nameModifyListener);
- remoteText.addModifyListener(remoteModifyListener);
- passText.addModifyListener(passModifyListener);
- }
-
- public class SetUserCommand extends ServerWorkingCopyPropertyCommand {
- public SetUserCommand(IServerWorkingCopy server) {
- super(server, Messages.EditorChangeUsernameCommandName, nameText, nameText.getText(),
- ExpressServerUtils.ATTRIBUTE_USERNAME, nameModifyListener);
- }
- }
-
- public class SetRemoteCommand extends ServerWorkingCopyPropertyCommand {
- public SetRemoteCommand(IServerWorkingCopy server) {
- super(server, "Change Remote Name", remoteText, remoteText.getText(),
- ExpressServerUtils.ATTRIBUTE_REMOTE_NAME, remoteModifyListener);
- }
- }
-
- public class SetPassCommand extends ServerWorkingCopyPropertyCommand {
- public SetPassCommand(IServerWorkingCopy server) {
- super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
- null, passModifyListener);
- oldVal = passText.getText();
- }
-
- public void execute() {
- passwordString = newVal;
- }
-
- public void undo() {
- passwordString = oldVal;
- text.removeModifyListener(listener);
- text.setText(oldVal);
- text.addModifyListener(listener);
- }
- }
-
/**
* Allow a section an opportunity to respond to a doSave request on the editor.
* @param monitor the progress monitor for the save operation.
*/
public void doSave(IProgressMonitor monitor) {
try {
- ExpressServerUtils.setExpressPassword(server.getOriginal(), passwordString);
+ ExpressServerUtils.setExpressPassword(server.getOriginal(), details.getPassword());
monitor.worked(100);
} catch( CoreException ce ) {
// TODO
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -10,50 +10,24 @@
*******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.behaviour;
-import java.util.Arrays;
-import java.util.List;
-
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.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.TaskModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil.ICompletable;
+import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil.NewServerWizardBehaviourCallback;
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftApplicationWizardModel;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPageModel;
-import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
-import com.openshift.express.client.OpenShiftException;
-
-public class ExpressWizardFragment extends WizardFragment {
+public class ExpressWizardFragment extends WizardFragment implements ICompletable {
private IWizardHandle handle;
- private IApplication fapplication;
- private IUser fuser;
- private String[] appListNames;
- private String error;
+ private ExpressDetailsComposite composite;
+ private NewServerWizardBehaviourCallback callback;
- private Button verifyButton;
public ExpressWizardFragment() {
// TODO Auto-generated constructor stub
}
@@ -61,182 +35,36 @@
public boolean hasComposite() {
return true;
}
+ public void setComplete(boolean complete) {
+ super.setComplete(complete);
+ }
+
- private String user, pass, app, remote;
- private Text userText, passText, remoteText;
- private Combo appNameCombo;
public Composite createComposite(Composite parent, IWizardHandle handle) {
this.handle = handle;
handle.setTitle("Create an Openshift Server");
handle.setDescription("Create an Openshift Server adapter by typing in your credentials and choosing an application.");
- Composite composite = createWidgets(parent);
- addListeners();
- setComplete(false);
- widgetsUpdated();
- return composite;
- }
-
- private Composite createWidgets(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
- Label userLabel = new Label(composite, SWT.NONE);
- userText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(userText);
- Label passLabel = new Label(composite, SWT.NONE);
- passText = new Text(composite, SWT.PASSWORD | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText);
- Label appNameLabel = new Label(composite, SWT.NONE);
- appNameCombo = new Combo(composite, SWT.SINGLE);
- Label remoteLabel = new Label(composite, SWT.NONE);
- remoteText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(remoteText);
- verifyButton = new Button(composite, SWT.PUSH);
-
- // Text
- userLabel.setText("Username: ");
- passLabel.setText("Password: ");
- appNameLabel.setText("Application Name: ");
- remoteLabel.setText("Remote: ");
- verifyButton.setText("Verify...");
- remoteText.setText(AbstractOpenShiftApplicationWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
- return composite;
- }
-
- private void addListeners() {
- // add listeners
- ModifyListener l = new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- widgetsUpdated();
+ callback = new NewServerWizardBehaviourCallback(getTaskModel(), handle, this) {
+ public void executeLongRunning(Job j) {
+ // depends on COMMON, DAMN
+ IWizardContainer container = ((WizardPage)handle).getWizard().getContainer();
+ try {
+ WizardUtils.runInWizard(j, null, container);
+ } catch(Exception e) {
+ // TODO clean
+ }
}
};
- userText.addModifyListener(l);
- passText.addModifyListener(l);
- appNameCombo.addModifyListener(l);
- remoteText.addModifyListener(l);
- appNameCombo.addSelectionListener(new SelectionListener(){
- public void widgetSelected(SelectionEvent e) {
- widgetsUpdated();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetsUpdated();
- }
- });
- verifyButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- verifyPressed();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- verifyPressed();
- }
-
- });
+ composite = ExpressDetailsComposite.createComposite(parent,callback, ExpressServerUtils.EXPRESS_SOURCE_MODE, true);
+ setComplete(false);
+ return composite.getComposite();
}
-
+
public void enter() {
// do nothing
}
-
- private void widgetsUpdated() {
- this.user = userText.getText();
- this.pass = passText.getText();
- this.app = appNameCombo.getText();
- this.remote = remoteText.getText();
- this.verifyButton.setEnabled(true);
- setComplete(false);
- handle.update();
- }
- private void verifyPressed() {
- final CredentialsWizardPageModel model = new CredentialsWizardPageModel(null);
- this.fapplication = null;
- this.fuser = null;
- this.appListNames = null;
- model.setPassword(pass);
- model.setRhLogin(user);
- verifyButton.setEnabled(false);
- setComplete(false);
- handle.update();
- final Runnable runnable = getVerifyingCredentialsJob(model);
- Job j = new Job("Verifying Credentials and Application") {
- protected IStatus run(IProgressMonitor monitor) {
- runnable.run();
- return Status.OK_STATUS;
- }
- };
- IWizardContainer container = ((WizardPage)handle).getWizard().getContainer();
- try {
- WizardUtils.runInWizard(j, null, container);
- postLongRunningValidate();
- } catch(Exception e) {
-
- }
- }
-
- private void postLongRunningValidate() {
- if( appListNames == null ) {
- appListNames = new String[0];
- }
- int index = Arrays.asList(appListNames).indexOf(app);
- appNameCombo.setItems(appListNames);
- if( index != -1 )
- appNameCombo.select(index);
- handle.setMessage(error, IMessageProvider.ERROR);
- verifyButton.setEnabled(true);
- setComplete(ExpressWizardFragment.this.fapplication != null );
- handle.update();
- }
-
- private Runnable getVerifyingCredentialsJob(final CredentialsWizardPageModel model) {
- return new Runnable() {
- public void run() {
- final IStatus s = model.validateCredentials();
- String error = null;
- String[] appNames = new String[]{};
- if( !s.isOK() ) {
- error = "Credentials Failed";
- } else {
- // now check the app name and cartridge
- try {
- final List<IApplication> allApps = model.getUser().getApplications();
- appNames = getAppNamesAsStrings(allApps);
- int index = Arrays.asList(appNames).indexOf(app);
- IApplication application = index == -1 ? null : allApps.get(index);
- appListNames = appNames;
- if( application == null ) {
- error = "Application " + app + " not found";
- } else {
- // Fill with new data
- try {
- ExpressWizardFragment.this.fapplication = application;
- ExpressWizardFragment.this.fuser = model.getUser();
-
- // update the values
- IServerWorkingCopy wc = (IServerWorkingCopy)getTaskModel().getObject(TaskModel.TASK_SERVER);
- ExpressServerUtils.fillServerWithOpenShiftDetails(wc, application, model.getUser(),
- ExpressServerUtils.EXPRESS_SOURCE_MODE, remote);
- } catch(CoreException ce) {
- // TODO FIX HANDLE
- }
- }
- } catch(OpenShiftException ose) {
- error = "Application \"" + app + "\" not found: " + ose.getMessage();
- }
- }
- ExpressWizardFragment.this.error = error;
- }
- };
- }
-
- private String[] getAppNamesAsStrings(List<IApplication> allApps) {
- String[] appNames = new String[allApps.size()];
- for( int i = 0; i < allApps.size(); i++ ) {
- appNames[i] = allApps.get(i).getName();
- }
- return appNames;
- }
-
public void performFinish(IProgressMonitor monitor) throws CoreException {
- // do nothing
+ ExpressServerUtils.setExpressPassword(callback.getServer(), composite.getPassword());
}
-
}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java 2012-02-03 01:09:36 UTC (rev 38405)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenShiftDeployUI.java 2012-02-03 05:28:40 UTC (rev 38406)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * 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.ui.behaviour;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.jboss.ide.eclipse.as.ui.UIUtil;
-import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
-import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-
-public class OpenShiftDeployUI implements IDeploymentTypeUI {
-
- public OpenShiftDeployUI() {
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public void fillComposite(Composite parent, IServerModeUICallback callback) {
- createWidgets(parent, callback);
- addListeners(callback);
- }
-
- private void addListeners(IServerModeUICallback callback) {
-
- }
-
- //private Text userText, passText;
- private Text userText, passText;
- private Combo modeCombo;
-
- private String safeString(String s) {
- return s == null ? "" : s;
- }
- private void createWidgets(Composite parent, IServerModeUICallback callback) {
- // TODO Auto-generated method stub
- parent.setLayout(new FillLayout());
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new FormLayout());
-
- Label nameLabel = new Label(composite, SWT.NONE);
- nameLabel.setText("OpenShift Username:");
- userText = new Text(composite, SWT.BORDER);
- Label passLabel = new Label(composite, SWT.NONE);
- passLabel.setText("OpenShift Password:");
- passText = new Text(composite, SWT.BORDER | SWT.PASSWORD);
-
- Label domainLabel = new Label(composite, SWT.NONE);
- domainLabel.setText("Domain: " + ExpressServerUtils.getExpressDomain(callback.getServer()));
- Label appLabel = new Label(composite, SWT.NONE);
- appLabel.setText("App: " + ExpressServerUtils.getExpressApplicationName(callback.getServer()));
-
- Label modeLabel = new Label(composite, SWT.NONE);
- modeLabel.setText("Mode: " + ExpressServerUtils.getExpressModeAsString(callback.getServer()));
-
- userText.setText(safeString(ExpressServerUtils.getExpressUsername(callback.getServer())));
- passText.setText(safeString(ExpressServerUtils.getExpressPassword(callback.getServer())));
- userText.setEnabled(false);
- passText.setEnabled(false);
- // Maybe just make this a label ??
-// modeCombo = new Combo(composite, SWT.READ_ONLY);
-// modeCombo.setItems(new String[]{
-// "Source", "Binary"
-// });
-// modeCombo.select(0);
-
- nameLabel.setLayoutData(UIUtil.createFormData2(0, 5,null,0,0,5,null,0));
- userText.setLayoutData(UIUtil.createFormData2(0,3,null,0,nameLabel,5,100,-5));
-
- passLabel.setLayoutData(UIUtil.createFormData2(userText, 5,null,0,0,5,null,0));
- passText.setLayoutData(UIUtil.createFormData2(userText,5,null,0,nameLabel,5,100,-5));
-
- domainLabel.setLayoutData(UIUtil.createFormData2(passText,5,null,0,0,5,null,0));
- appLabel.setLayoutData(UIUtil.createFormData2(domainLabel,5,null,0,0,5,null,0));
- modeLabel.setLayoutData(UIUtil.createFormData2(appLabel,5,null,0,0,5,null,0));
-// modeCombo.setLayoutData(UIUtil.createFormData2(appLabel,3,null,0,modeLabel,5,100,-5));
- }
-
-}
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38405 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-02 20:09:36 -0500 (Thu, 02 Feb 2012)
New Revision: 38405
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
Log:
JBIDE-10678
https://issues.jboss.org/browse/JBIDE-10678
Label keys adjusted.
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2012-02-03 00:47:53 UTC (rev 38404)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2012-02-03 01:09:36 UTC (rev 38405)
@@ -48,6 +48,9 @@
FileSeamComponent20_AddMapProperty.Title=Property
FileSeamComponent20_Properties.Title=File Seam Component 2.0
+FileSeamComponent21_Properties.Title=File Seam Component 2.1
+FileSeamComponent22_Properties.Title=File Seam Component 2.2
+FileSeamComponent23_Properties.Title=File Seam Component 2.3
FileSeamComponent20_EditorActionList_AddProperty.WindowTitle=Add Simple Property
FileSeamComponent20_EditorActionList_AddProperty.Title=Property
@@ -61,76 +64,31 @@
FileSeamComponents11_Rename.WindowTitle=Rename
FileSeamComponents11_Rename.Title=File Seam Components 1.1
-FileSeamComponents11_AddComponent.WindowTitle=Add Component
-FileSeamComponents11_AddComponent.Title=Seam Component
+Seam.AddComponent.WindowTitle=Add Component
+Seam.AddComponent.Title=Seam Component
-FileSeamComponents11_AddFactory.WindowTitle=Add Factory
-FileSeamComponents11_AddFactory.Title=Seam Factory
+Seam.AddFactory.WindowTitle=Add Factory
+Seam.AddFactory.Title=Seam Factory
-FileSeamComponents11_AddEvent.WindowTitle=Add Event
-FileSeamComponents11_AddEvent.Title=Seam Event
+Seam.AddEvent.WindowTitle=Add Event
+Seam.AddEvent.Title=Seam Event
FileSeamComponents11_Properties.Title=File Seam Component 1.1
-FileSeamComponents11_EditorActionList_AddComponent.WindowTitle=Add Component
-FileSeamComponents11_EditorActionList_AddComponent.Title=Seam Component
-
-FileSeamComponents11_EditorActionList_AddFactory.WindowTitle=Add Factory
-FileSeamComponents11_EditorActionList_AddFactory.Title=Seam Factory
-
-FileSeamComponents11_EditorActionList_AddEvent.WindowTitle=Add Event
-FileSeamComponents11_EditorActionList_AddEvent.Title=Seam Event
-
FileSeamComponents12_Rename.WindowTitle=Rename
FileSeamComponents12_Rename.Title=File Seam Components 1.2
-FileSeamComponents12_AddComponent.WindowTitle=Add Component
-FileSeamComponents12_AddComponent.Title=Seam Component
-
-FileSeamComponents12_AddFactory.WindowTitle=Add Factory
-FileSeamComponents12_AddFactory.Title=Seam Factory
-
-FileSeamComponents12_AddEvent.WindowTitle=Add Event
-FileSeamComponents12_AddEvent.Title=Seam Event
-
-FileSeamComponents12_EditorActionList_AddComponent.WindowTitle=Add Component
-FileSeamComponents12_EditorActionList_AddComponent.Title=Seam Component
-
-FileSeamComponents12_EditorActionList_AddFactory.WindowTitle=Add Factory
-FileSeamComponents12_EditorActionList_AddFactory.Title=Seam Factory
-
-FileSeamComponents12_EditorActionList_AddEvent.WindowTitle=Add Event
-FileSeamComponents12_EditorActionList_AddEvent.Title=Seam Event
-
FileSeamComponents20_Rename.WindowTitle=Rename
FileSeamComponents20_Rename.Title=File Seam Components 2.0
-FileSeamComponents20_AddComponent.WindowTitle=Add Component
-FileSeamComponents20_AddComponent.Title=Seam Component
+Seam.AddImport.WindowTitle=Add Import
+Seam.AddImport.Title=Seam Import
-FileSeamComponents20_AddFactory.WindowTitle=Add Factory
-FileSeamComponents20_AddFactory.Title=Seam Factory
-
-FileSeamComponents20_AddEvent.WindowTitle=Add Event
-FileSeamComponents20_AddEvent.Title=Seam Event
-
-FileSeamComponents20_AddImport.WindowTitle=Add Import
-FileSeamComponents20_AddImport.Title=Seam Import
-
FileSeamComponents20_Properties.Title=File Seam Components 2.0
+FileSeamComponents21_Properties.Title=File Seam Components 2.1
+FileSeamComponents22_Properties.Title=File Seam Components 2.2
+FileSeamComponents23_Properties.Title=File Seam Components 2.3
-FileSeamComponents20_EditorActionList_AddComponent.WindowTitle=Add Component
-FileSeamComponents20_EditorActionList_AddComponent.Title=Seam Component
-
-FileSeamComponents20_EditorActionList_AddFactory.WindowTitle=Add Factory
-FileSeamComponents20_EditorActionList_AddFactory.Title=Seam Factory
-
-FileSeamComponents20_EditorActionList_AddEvent.WindowTitle=Add Event
-FileSeamComponents20_EditorActionList_AddEvent.Title=Seam Event
-
-FileSeamComponents20_EditorActionList_AddImport.WindowTitle=Add Import
-FileSeamComponents20_EditorActionList_AddImport.Title=Seam Import
-
SeamAction_Properties.Title=Seam Action
SeamAction20_Properties.Title=Seam Action
@@ -259,9 +217,6 @@
FileSeamComponents12_AddTransactionListener.WindowTitle=Add Transaction Listener
FileSeamComponents12_AddTransactionListener.Title=Seam Core Transaction Listener
-FileSeamComponents12_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_AddEJB.Title=Seam Core EJB
-
FileSeamComponents12_AddInit.WindowTitle=Add Init
FileSeamComponents12_AddInit.Title=Seam Core Init
@@ -307,9 +262,6 @@
FileSeamComponents12_EditorActionList_AddTransactionListener.WindowTitle=Add Transaction Listener
FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Seam Core Transaction Listener
-FileSeamComponents12_EditorActionList_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_EditorActionList_AddEJB.Title=Seam Core EJB
-
FileSeamComponents12_EditorActionList_AddInit.WindowTitle=Add Init
FileSeamComponents12_EditorActionList_AddInit.Title=Seam Core Init
@@ -475,12 +427,6 @@
SeamSecurityIdentity_Properties.Title=Seam Security Identity
-FileSeamComponents12_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_AddIdentity.Title=Seam Security Identity
-
-FileSeamComponents12_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_EditorActionList_AddIdentity.Title=Seam Security Identity
-
SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry
SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location
@@ -501,12 +447,6 @@
SeamThemeSelector_Properties.Title=Seam Theme Selector
-FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_AddThemeSelector.Title=Seam Theme Selector
-
-FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
-
SeamWebContextFilter_Properties.Title=Seam Web Context Filter
SeamWebExceptionFilter_Properties.Title=Seam Web Exception Filter
@@ -515,30 +455,6 @@
SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter
-FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents12_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
-
SeamBPMActor20_Properties.Title=Seam BPM Actor
SeamBPMJBPM20_Properties.Title=Seam JBPM
@@ -681,27 +597,15 @@
SeamTransactionHibernate_Properties.Title=Seam Transaction Hibernate
-FileSeamComponents20_AddEjb.WindowTitle=Add EJB
-FileSeamComponents20_AddEjb.Title=Seam Transaction EJB
-
FileSeamComponents20_AddEntity.WindowTitle=Add Entity
FileSeamComponents20_AddEntity.Title=Seam Transaction Entity
-FileSeamComponents20_AddHibernate.WindowTitle=Add Hibernate
-FileSeamComponents20_AddHibernate.Title=Seam Transaction Hibernate
-
FileSeamComponents20_AddNo.WindowTitle=Add No Transaction
FileSeamComponents20_AddNo.Title=Seam No Transaction
-FileSeamComponents20_EditorActionList_AddEjb.WindowTitle=Add EJB
-FileSeamComponents20_EditorActionList_AddEjb.Title=Seam Transaction EJB
-
FileSeamComponents20_EditorActionList_AddEntity.WindowTitle=Add Entity
FileSeamComponents20_EditorActionList_AddEntity.Title=Seam Transaction Entity
-FileSeamComponents20_EditorActionList_AddHibernate.WindowTitle=Add Hibernate
-FileSeamComponents20_EditorActionList_AddHibernate.Title=Seam Transaction Hibernate
-
FileSeamComponents20_EditorActionList_AddNo.WindowTitle=Add No Transaction
FileSeamComponents20_EditorActionList_AddNo.Title=Seam No Transaction
@@ -715,57 +619,9 @@
SeamWebServletSession20_Properties.Title=Seam Web Servlet Session
-FileSeamComponents20_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents20_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents20_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents20_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents20_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents20_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents20_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents20_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents20_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
-FileSeamComponents20_AddAuthenticationFilter.Title=Seam Web Authentication Filter
-
-FileSeamComponents20_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
-FileSeamComponents20_AddCharacterFilter.Title=Seam Web Character Filter
-
-FileSeamComponents20_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
-FileSeamComponents20_AddAjaxFilter.Title=Seam Web Ajax Filter
-
-FileSeamComponents20_AddLoggingFilter.WindowTitle=Add Logging Filter
-FileSeamComponents20_AddLoggingFilter.Title=Seam Web Logging Filter
-
FileSeamComponents20_AddServletSession.WindowTitle=Add Servlet Session
FileSeamComponents20_AddServletSession.Title=Seam Web Servlet Session
-FileSeamComponents20_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents20_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents20_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents20_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents20_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents20_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents20_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents20_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents20_EditorActionList_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
-FileSeamComponents20_EditorActionList_AddAuthenticationFilter.Title=Seam Web Authentication Filter
-
-FileSeamComponents20_EditorActionList_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
-FileSeamComponents20_EditorActionList_AddCharacterFilter.Title=Seam Web Character Filter
-
-FileSeamComponents20_EditorActionList_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
-FileSeamComponents20_EditorActionList_AddAjaxFilter.Title=Seam Web Ajax Filter
-
-FileSeamComponents20_EditorActionList_AddLoggingFilter.WindowTitle=Add Logging Filter
-FileSeamComponents20_EditorActionList_AddLoggingFilter.Title=Seam Web Logging Filter
-
FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session
FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session
@@ -966,23 +822,8 @@
SeamSecurityIdentity20_Properties.Title=Seam Security Identity
-FileSeamComponents20_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents20_AddIdentity.Title=Seam Security Identity
-
-FileSeamComponents20_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents20_EditorActionList_AddIdentity.Title=Seam Security Identity
-
SeamThemeSelector20_Properties.Title=Seam Theme Selector
-FileSeamComponents20_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents20_AddThemeSelector.Title=Seam Theme Selector
-
-FileSeamComponents20_AddNavigationPages.WindowTitle=Add Navigation Pages
-FileSeamComponents20_AddNavigationPages.Title=Seam Navigation Pages
-
-FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents20_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
-
FileSeamComponents21_AddTimer.WindowTitle=Add Timer Service Dispatcher
FileSeamComponents21_AddTimer.Title=Seam Async Timer
@@ -1022,31 +863,7 @@
FileSeamComponents12_EditorActionList_Properties.Title=File Seam Components_ Editor Action List
FileSeamComponents20_Rename.Message=
-FileSeamComponents21_AddComponent.WindowTitle=Add Component
-FileSeamComponents21_AddComponent.Title=Seam Component
-FileSeamComponents21_AddFactory.WindowTitle=Add Factory
-
-FileSeamComponents21_AddFactory.Title=Seam Factory
-FileSeamComponents21_AddEvent.WindowTitle=Add Event
-
-FileSeamComponents21_AddEvent.Title=Seam Event
-FileSeamComponents21_AddImport.WindowTitle=Add Import
-
-FileSeamComponents21_AddImport.Title=Seam Import
-
-FileSeamComponents22_AddComponent.WindowTitle=Add Component
-
-FileSeamComponents22_AddComponent.Title=Seam Component
-FileSeamComponents22_AddFactory.WindowTitle=Add Factory
-
-FileSeamComponents22_AddFactory.Title=Seam Factory
-FileSeamComponents22_AddEvent.WindowTitle=Add Event
-
-FileSeamComponents22_AddEvent.Title=Seam Event
-FileSeamComponents22_AddImport.WindowTitle=Add Import
-
-FileSeamComponents22_AddImport.Title=Seam Import
SeamComponent_AddAnyProperty.WindowTitle=Add Property
SeamComponent20_Properties.Title=Seam Component
@@ -1201,139 +1018,103 @@
FileSeamComponents22_AddResourceLoader.WindowTitle=Add Resource Loader
FileSeamComponents22_AddResourceLoader.Title=Seam Core Resource Loader
-FileSeamComponents22_AddActor.WindowTitle=Add Actor
-FileSeamComponents22_AddActor.Title=Seam BPM Actor
+Seam.AddActor.WindowTitle=Add Actor
+Seam.AddActor.Title=Seam BPM Actor
-FileSeamComponents22_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents22_AddJBPM.Title=Seam JBPM
+Seam.AddJBPM.WindowTitle=Add JBPM
+Seam.AddJBPM.Title=Seam JBPM
-FileSeamComponents22_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents22_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
+Seam.AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
+Seam.AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
-FileSeamComponents22_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents22_AddRuleBase.Title=Seam Drools Rule Base
+Seam.AddRuleBase.WindowTitle=Add Rule Base
+Seam.AddRuleBase.Title=Seam Drools Rule Base
-FileSeamComponents22_AddRuleAgent.WindowTitle=Add Rule Agent
-FileSeamComponents22_AddRuleAgent.Title=Seam Drools Rule Agent
+Seam.AddRuleAgent.WindowTitle=Add Rule Agent
+Seam.AddRuleAgent.Title=Seam Drools Rule Agent
-FileSeamComponents22_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents22_AddEntityQuery.Title=Seam Framework Entity Query
+Seam.AddEntityQuery.WindowTitle=Add Entity Query
+Seam.AddEntityQuery.Title=Seam Framework Entity Query
-FileSeamComponents22_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents22_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
+Seam.AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
+Seam.AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
-FileSeamComponents22_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents22_AddEntityHome.Title=Seam Framework Entity Home
+Seam.AddEntityHome.WindowTitle=Add Entity Home
+Seam.AddEntityHome.Title=Seam Framework Entity Home
-FileSeamComponents22_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents22_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
+Seam.AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
+Seam.AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-FileSeamComponents22_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents22_AddLocaleSelector.Title=Seam Core Locale Selector
+Seam.AddLocaleSelector.WindowTitle=Add Locale Selector
+Seam.AddLocaleSelector.Title=Seam Core Locale Selector
-FileSeamComponents22_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents22_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
+Seam.AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
+Seam.AddTimeZoneSelector.Title=Seam Core Time Zone Selector
-FileSeamComponents22_AddLocaleConfig.WindowTitle=Add Locale Config
-FileSeamComponents22_AddLocaleConfig.Title=Seam International Locale Config
+Seam.AddLocaleConfig.WindowTitle=Add Locale Config
+Seam.AddLocaleConfig.Title=Seam International Locale Config
-FileSeamComponents22_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents22_AddQueueConnection.Title=Seam Jms Queue Connection
+Seam.AddQueueConnection.WindowTitle=Add Queue Connection
+Seam.AddQueueConnection.Title=Seam Jms Queue Connection
-FileSeamComponents22_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents22_AddTopicConnection.Title=Seam Jms Topic Connection
+Seam.AddTopicConnection.WindowTitle=Add Topic Connection
+Seam.AddTopicConnection.Title=Seam Jms Topic Connection
-FileSeamComponents22_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents22_AddTopicPublisher.Title=Seam Jms Topic Publisher
+Seam.AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
+Seam.AddTopicPublisher.Title=Seam Jms Topic Publisher
-FileSeamComponents22_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents22_AddQueueSender.Title=Seam Jms Queue Sender
+Seam.AddQueueSender.WindowTitle=Add Managed Queue Sender
+Seam.AddQueueSender.Title=Seam Jms Queue Sender
-FileSeamComponents22_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents22_AddMailSession.Title=Seam Mail Session
+Seam.AddMailSession.WindowTitle=Add Mail Session
+Seam.AddMailSession.Title=Seam Mail Session
-FileSeamComponents22_AddMeldware.WindowTitle=Add Meldware
-FileSeamComponents22_AddMeldware.Title=Seam Mail Meldware
+Seam.AddMeldware.WindowTitle=Add Meldware
+Seam.AddMeldware.Title=Seam Mail Meldware
-FileSeamComponents22_AddMeldwareUser.WindowTitle=Add Meldware User
-FileSeamComponents22_AddMeldwareUser.Title=Seam Mail Meldware User
+Seam.AddMeldwareUser.WindowTitle=Add Meldware User
+Seam.AddMeldwareUser.Title=Seam Mail Meldware User
FileSeamComponents22_AddDocumentStore.WindowTitle=Add Document Store
FileSeamComponents22_AddDocumentStore.Title=Seam Pdf Document Store
-FileSeamComponents22_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents22_AddKeyStoreConfig.Title=Seam Pdf Key Store Config
+Seam.AddKeyStoreConfig.WindowTitle=Add Key Store Config
+Seam.AddKeyStoreConfig.Title=Seam Pdf Key Store Config
-FileSeamComponents22_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents22_AddManagedPersistenceContext.Title=Seam Persistence Managed Context
+Seam.AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
+Seam.AddManagedPersistenceContext.Title=Seam Persistence Managed Context
-FileSeamComponents22_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents22_AddEntityManagerFactory.Title=Seam Persistence Entity Manager Factory
+Seam.AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
+Seam.AddEntityManagerFactory.Title=Seam Persistence Entity Manager Factory
FileSeamComponents22_AddFilter.WindowTitle=Add Filter
FileSeamComponents22_AddFilter.Title=Seam Persistence Filter
-FileSeamComponents22_AddManagedHibernateSession.WindowTitle=Add Managed Hibernate Session
-FileSeamComponents22_AddManagedHibernateSession.Title=Seam Persistence Managed Hibernate Session
+Seam.AddManagedHibernateSession.WindowTitle=Add Managed Hibernate Session
+Seam.AddManagedHibernateSession.Title=Seam Persistence Managed Hibernate Session
-FileSeamComponents22_AddHibernateSessionFactory.WindowTitle=Add Hibernate Session Factory
-FileSeamComponents22_AddHibernateSessionFactory.Title=Seam Persistence Hibernate Session Factory
+Seam.AddHibernateSessionFactory.WindowTitle=Add Hibernate Session Factory
+Seam.AddHibernateSessionFactory.Title=Seam Persistence Hibernate Session Factory
SeamRemotingConfig20_Properties.Title=Seam Remoting Config
FileSeamComponents21_AddRemotingConfig.WindowTitle=Add Config
FileSeamComponents21_AddRemotingConfig.Title=Seam Remoting
-FileSeamComponents22_AddRemotingConfig.WindowTitle=Add Config
-FileSeamComponents22_AddRemotingConfig.Title=Seam Remoting
+Seam.AddRemotingConfig.WindowTitle=Add Config
+Seam.AddRemotingConfig.Title=Seam Remoting
SeamFacesSecurityEvents20_Properties.Title=Seam Faces Security Events
FileSeamComponents20_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
FileSeamComponents20_AddFacesSecurityEvents.Title=Seam Faces Security Events
-FileSeamComponents21_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents21_AddIdentity.Title=Seam Security Identity
-
FileSeamComponents21_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
FileSeamComponents21_AddFacesSecurityEvents.Title=Seam Faces Security Events
-FileSeamComponents21_AddIdentityManager.WindowTitle=Add Identity Manager
-FileSeamComponents21_AddIdentityManager.Title=Seam Security Identity Manager
-
-FileSeamComponents21_AddJPAIdentityStore.WindowTitle=Add JPA Identity Store
-FileSeamComponents21_AddJPAIdentityStore.Title=Seam Security JPAIdentity Store
-
-FileSeamComponents21_AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store
-FileSeamComponents21_AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store
-
-FileSeamComponents21_AddPermissionManager.WindowTitle=Add Permission Manager
-FileSeamComponents21_AddPermissionManager.Title=Seam Security Permission Manager
-
-FileSeamComponents21_AddJPAPermissionStore.WindowTitle=Add JPA Permission Store
-FileSeamComponents21_AddJPAPermissionStore.Title=Seam Security JPAPermission Store
-
-FileSeamComponents21_AddRuleBasedPermissionResolver.WindowTitle=Add Rule Based Permission Resolver
-FileSeamComponents21_AddRuleBasedPermissionResolver.Title=Seam Security Rule Based Permission Resolver
-
-FileSeamComponents21_AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver
-FileSeamComponents21_AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver
-
-FileSeamComponents21_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents21_AddThemeSelector.Title=Seam Theme Selector
-
-FileSeamComponents21_AddNavigationPages.WindowTitle=Add Navigation Pages
-FileSeamComponents21_AddNavigationPages.Title=Seam Navigation Pages
-
-FileSeamComponents21_AddEjb.WindowTitle=Add Ejb
-FileSeamComponents21_AddEjb.Title=Seam Transaction Ejb
-
FileSeamComponents21_AddEntity.WindowTitle=Add Entity
FileSeamComponents21_AddEntity.Title=Seam Transaction Entity
-FileSeamComponents21_AddHibernate.WindowTitle=Add Hibernate
-FileSeamComponents21_AddHibernate.Title=Seam Transaction Hibernate
-
FileSeamComponents21_AddNo.WindowTitle=Add No Transaction
FileSeamComponents21_AddNo.Title=Seam No Transaction
@@ -1346,140 +1127,104 @@
FileSeamComponents21_AddEntityConverter.WindowTitle=Add Entity Converter
FileSeamComponents21_AddEntityConverter.Title=Seam UIEntity Converter
-FileSeamComponents21_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents21_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents21_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents21_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents21_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents21_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents21_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents21_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents21_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
-FileSeamComponents21_AddAuthenticationFilter.Title=Seam Web Authentication Filter
-
-FileSeamComponents21_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
-FileSeamComponents21_AddCharacterFilter.Title=Seam Web Character Filter
-
-FileSeamComponents21_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
-FileSeamComponents21_AddAjaxFilter.Title=Seam Web Ajax Filter
-
-FileSeamComponents21_AddLoggingFilter.WindowTitle=Add Logging Filter
-FileSeamComponents21_AddLoggingFilter.Title=Seam Web Logging Filter
-
-FileSeamComponents21_AddSession.WindowTitle=Add Session
-FileSeamComponents21_AddSession.Title=Seam Web Session
-
-FileSeamComponents21_AddIdentityFilter.WindowTitle=Add Identity Filter
-FileSeamComponents21_AddIdentityFilter.Title=Seam Web Identity Filter
-
-FileSeamComponents21_AddWicketFilter.WindowTitle=Add Wicket Filter
-FileSeamComponents21_AddWicketFilter.Title=Seam Web Wicket Filter
-
FileSeamComponents21_AddWebApplication.WindowTitle=Add Web Application
FileSeamComponents21_AddWebApplication.Title=Seam Wicket Web App
-FileSeamComponents21_AddRememberMe.WindowTitle=Add Remember Me
-FileSeamComponents21_AddRememberMe.Title=Seam Sequrity Remember Me
+Seam.AddIdentity.WindowTitle=Add Identity
+Seam.AddIdentity.Title=Seam Security Identity
-FileSeamComponents22_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents22_AddIdentity.Title=Seam Security Identity
+Seam.AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
+Seam.AddFacesSecurityEvents.Title=Seam Faces Security Events
-FileSeamComponents22_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
-FileSeamComponents22_AddFacesSecurityEvents.Title=Seam Faces Security Events
+Seam.AddIdentityManager.WindowTitle=Add Identity Manager
+Seam.AddIdentityManager.Title=Seam Security Identity Manager
-FileSeamComponents22_AddIdentityManager.WindowTitle=Add Identity Manager
-FileSeamComponents22_AddIdentityManager.Title=Seam Security Identity Manager
+Seam.AddJPAIdentityStore.WindowTitle=Add JPA Identity Store
+Seam.AddJPAIdentityStore.Title=Seam Security JPAIdentity Store
-FileSeamComponents22_AddJPAIdentityStore.WindowTitle=Add JPA Identity Store
-FileSeamComponents22_AddJPAIdentityStore.Title=Seam Security JPAIdentity Store
+Seam.AddJPATokenStore.WindowTitle=Add JPA Token Store
+Seam.AddJPATokenStore.Title=Seam Security JPAToken Store
-FileSeamComponents22_AddJPATokenStore.WindowTitle=Add JPA Token Store
-FileSeamComponents22_AddJPATokenStore.Title=Seam Security JPAToken Store
+Seam.AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store
+Seam.AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store
-FileSeamComponents22_AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store
-FileSeamComponents22_AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store
+Seam.AddPermissionManager.WindowTitle=Add Permission Manager
+Seam.AddPermissionManager.Title=Seam Security Permission Manager
-FileSeamComponents22_AddPermissionManager.WindowTitle=Add Permission Manager
-FileSeamComponents22_AddPermissionManager.Title=Seam Security Permission Manager
+Seam.AddJPAPermissionStore.WindowTitle=Add JPA Permission Store
+Seam.AddJPAPermissionStore.Title=Seam Security JPAPermission Store
-FileSeamComponents22_AddJPAPermissionStore.WindowTitle=Add JPA Permission Store
-FileSeamComponents22_AddJPAPermissionStore.Title=Seam Security JPAPermission Store
+Seam.AddRuleBasedPermissionResolver.WindowTitle=Add Rule Based Permission Resolver
+Seam.AddRuleBasedPermissionResolver.Title=Seam Security Rule Based Permission Resolver
-FileSeamComponents22_AddRuleBasedPermissionResolver.WindowTitle=Add Rule Based Permission Resolver
-FileSeamComponents22_AddRuleBasedPermissionResolver.Title=Seam Security Rule Based Permission Resolver
+Seam.AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver
+Seam.AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver
-FileSeamComponents22_AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver
-FileSeamComponents22_AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver
+Seam.AddRememberMe.WindowTitle=Add Remember Me
+Seam.AddRememberMe.Title=Seam Sequrity Remember Me
-FileSeamComponents22_AddRememberMe.WindowTitle=Add Remember Me
-FileSeamComponents22_AddRememberMe.Title=Seam Sequrity Remember Me
+Seam.AddThemeSelector.WindowTitle=Add Theme Selector
+Seam.AddThemeSelector.Title=Seam Theme Selector
-FileSeamComponents22_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents22_AddThemeSelector.Title=Seam Theme Selector
+Seam.AddNavigationPages.WindowTitle=Add Navigation Pages
+Seam.AddNavigationPages.Title=Seam Navigation Pages
-FileSeamComponents22_AddNavigationPages.WindowTitle=Add Navigation Pages
-FileSeamComponents22_AddNavigationPages.Title=Seam Navigation Pages
+Seam.AddEjb.WindowTitle=Add Ejb
+Seam.AddEjb.Title=Seam Transaction Ejb
-FileSeamComponents22_AddEjb.WindowTitle=Add Ejb
-FileSeamComponents22_AddEjb.Title=Seam Transaction Ejb
+Seam.AddEntity.WindowTitle=Add Entity
+Seam.AddEntity.Title=Seam Transaction Entity
-FileSeamComponents22_AddEntity.WindowTitle=Add Entity
-FileSeamComponents22_AddEntity.Title=Seam Transaction Entity
+Seam.AddHibernate.WindowTitle=Add Hibernate
+Seam.AddHibernate.Title=Seam Transaction Hibernate
-FileSeamComponents22_AddHibernate.WindowTitle=Add Hibernate
-FileSeamComponents22_AddHibernate.Title=Seam Transaction Hibernate
-
FileSeamComponents22_AddNo.WindowTitle=Add No Transaction
FileSeamComponents22_AddNo.Title=Seam No Transaction
-FileSeamComponents22_AddJPAEntityLoader.WindowTitle=Add JPA Entity Loader
-FileSeamComponents22_AddJPAEntityLoader.Title=Seam UIJPA
+Seam.AddJPAEntityLoader.WindowTitle=Add JPA Entity Loader
+Seam.AddJPAEntityLoader.Title=Seam UIJPA
-FileSeamComponents22_AddHibernateEntityLoader.WindowTitle=Add Hibernate Entity Loader
-FileSeamComponents22_AddHibernateEntityLoader.Title=Seam UIHibernate
+Seam.AddHibernateEntityLoader.WindowTitle=Add Hibernate Entity Loader
+Seam.AddHibernateEntityLoader.Title=Seam UIHibernate
-FileSeamComponents22_AddEntityConverter.WindowTitle=Add Entity Converter
-FileSeamComponents22_AddEntityConverter.Title=Seam UIEntity Converter
+Seam.AddEntityConverter.WindowTitle=Add Entity Converter
+Seam.AddEntityConverter.Title=Seam UIEntity Converter
-FileSeamComponents22_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents22_AddContextFilter.Title=Seam Web Context Filter
+Seam.AddContextFilter.WindowTitle=Add Context Filter
+Seam.AddContextFilter.Title=Seam Web Context Filter
-FileSeamComponents22_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents22_AddExceptionFilter.Title=Seam Web Exception Filter
+Seam.AddExceptionFilter.WindowTitle=Add Exception Filter
+Seam.AddExceptionFilter.Title=Seam Web Exception Filter
-FileSeamComponents22_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents22_AddMultipartFilter.Title=Seam Web Multipart Filter
+Seam.AddMultipartFilter.WindowTitle=Add Multipart Filter
+Seam.AddMultipartFilter.Title=Seam Web Multipart Filter
-FileSeamComponents22_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents22_AddRedirectFilter.Title=Seam Web Redirect Filter
+Seam.AddRedirectFilter.WindowTitle=Add Redirect Filter
+Seam.AddRedirectFilter.Title=Seam Web Redirect Filter
-FileSeamComponents22_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
-FileSeamComponents22_AddAuthenticationFilter.Title=Seam Web Authentication Filter
+Seam.AddAuthenticationFilter.WindowTitle=Add Authentication Filter
+Seam.AddAuthenticationFilter.Title=Seam Web Authentication Filter
-FileSeamComponents22_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
-FileSeamComponents22_AddCharacterFilter.Title=Seam Web Character Filter
+Seam.AddCharacterFilter.WindowTitle=Add Character Encoding Filter
+Seam.AddCharacterFilter.Title=Seam Web Character Filter
-FileSeamComponents22_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
-FileSeamComponents22_AddAjaxFilter.Title=Seam Web Ajax Filter
+Seam.AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
+Seam.AddAjaxFilter.Title=Seam Web Ajax Filter
-FileSeamComponents22_AddLoggingFilter.WindowTitle=Add Logging Filter
-FileSeamComponents22_AddLoggingFilter.Title=Seam Web Logging Filter
+Seam.AddLoggingFilter.WindowTitle=Add Logging Filter
+Seam.AddLoggingFilter.Title=Seam Web Logging Filter
-FileSeamComponents22_AddSession.WindowTitle=Add Session
-FileSeamComponents22_AddSession.Title=Seam Web Session
+Seam.AddSession.WindowTitle=Add Session
+Seam.AddSession.Title=Seam Web Session
-FileSeamComponents22_AddIdentityFilter.WindowTitle=Add Identity Filter
-FileSeamComponents22_AddIdentityFilter.Title=Seam Web Identity Filter
+Seam.AddIdentityFilter.WindowTitle=Add Identity Filter
+Seam.AddIdentityFilter.Title=Seam Web Identity Filter
-FileSeamComponents22_AddWicketFilter.WindowTitle=Add Wicket Filter
-FileSeamComponents22_AddWicketFilter.Title=Seam Web Wicket Filter
+Seam.AddWicketFilter.WindowTitle=Add Wicket Filter
+Seam.AddWicketFilter.Title=Seam Web Wicket Filter
-FileSeamComponents22_AddWebApplication.WindowTitle=Add Web Application
-FileSeamComponents22_AddWebApplication.Title=Seam Wicket Web App
+Seam.AddWebApplication.WindowTitle=Add Web Application
+Seam.AddWebApplication.Title=Seam Wicket Web App
Seam.AddCacheControlFilter.WindowTitle=Add Cache Control Filter
Seam.AddCacheControlFilter.Title=Seam Cache Control Filter
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38404 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-02-02 19:47:53 -0500 (Thu, 02 Feb 2012)
New Revision: 38404
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
Log:
Renaming java element does not force to re-validate related resources https://issues.jboss.org/browse/JBIDE-10767
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-02-02 22:40:23 UTC (rev 38403)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-02-03 00:47:53 UTC (rev 38404)
@@ -23,7 +23,6 @@
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
@@ -32,6 +31,7 @@
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
+import org.jboss.tools.common.refactoring.BaseFileChange;
import org.jboss.tools.common.util.BeanUtil;
import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jst.web.kb.refactoring.ELProjectSetExtension;
@@ -45,7 +45,7 @@
private RenameMethodSearcher searcher;
private RefactoringStatus status;
private CompositeChange rootChange;
- private TextFileChange lastChange;
+ private BaseFileChange lastChange;
private ArrayList<String> keys = new ArrayList<String>();
private ArrayList<Object> otherElements = new ArrayList<Object>();
@@ -136,18 +136,18 @@
return false;
}
- protected TextFileChange getChange(IFile file){
+ protected BaseFileChange getChange(IFile file){
if(lastChange != null && lastChange.getFile().equals(file))
return lastChange;
for(int i=0; i < rootChange.getChildren().length; i++){
- TextFileChange change = (TextFileChange)rootChange.getChildren()[i];
+ BaseFileChange change = (BaseFileChange)rootChange.getChildren()[i];
if(change.getFile().equals(file)){
lastChange = change;
return lastChange;
}
}
- lastChange = new TextFileChange(file.getName(), file);
+ lastChange = new BaseFileChange(file);
MultiTextEdit root = new MultiTextEdit();
lastChange.setEdit(root);
rootChange.add(lastChange);
@@ -158,7 +158,7 @@
private void change(IFile file, int offset, int length, String text){
String key = file.getFullPath().toString()+" "+offset;
if(!keys.contains(key)){
- TextFileChange change = getChange(file);
+ BaseFileChange change = getChange(file);
TextEdit edit = new ReplaceEdit(offset, length, text);
change.addEdit(edit);
keys.add(key);
@@ -177,6 +177,7 @@
}
}
+ @Override
protected void outOfSynch(IProject project){
status.addFatalError(NLS.bind(JsfUIMessages.RENAME_METHOD_PARTICIPANT_OUT_OF_SYNC_PROJECT, project.getFullPath().toString()));
}
@@ -189,6 +190,7 @@
change(file, offset, length, newName);
}
+ @Override
protected IProject[] getProjects(){
if(projectSet != null){
return projectSet.getLinkedProjects();
@@ -196,6 +198,7 @@
return new IProject[]{baseFile.getProject()};
}
+ @Override
protected IContainer getViewFolder(IProject project){
if(projectSet != null){
return projectSet.getViewFolder(project);
@@ -205,6 +208,7 @@
}
}
+ @Override
public void addElement(Object element, RefactoringArguments arguments) {
otherElements.add(element);
}
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38403 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-02 17:40:23 -0500 (Thu, 02 Feb 2012)
New Revision: 38403
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
fixed compilation error
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-02-02 21:54:37 UTC (rev 38402)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-02-02 22:40:23 UTC (rev 38403)
@@ -908,7 +908,7 @@
try{
IJavaElement javaElement = findJavaElement(file, start);
- if(null && javaElement instanceof IField){
+ if(javaElement instanceof IField){
IField field = (IField)javaElement;
if(!Flags.isStatic(field.getFlags()) && !field.isBinary())
return field;
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38402 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-02 16:54:37 -0500 (Thu, 02 Feb 2012)
New Revision: 38402
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
code cleanup
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-02-02 20:04:49 UTC (rev 38401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-02-02 21:54:37 UTC (rev 38402)
@@ -431,8 +431,8 @@
}
}
}
- srcs = ps.toArray(new IPath[0]);
- outs = os.toArray(new IPath[0]);
+ srcs = ps.toArray(new IPath[ps.size()]);
+ outs = os.toArray(new IPath[os.size()]);
} catch(CoreException ce) {
CDICorePlugin.getDefault().logError("Error while locating java source roots for " + project, ce);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2012-02-02 20:04:49 UTC (rev 38401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2012-02-02 21:54:37 UTC (rev 38402)
@@ -618,11 +618,11 @@
}
public void dispose() {
- CDICoreNature[] ds = dependsOn.toArray(new CDICoreNature[0]);
+ CDICoreNature[] ds = dependsOn.toArray(new CDICoreNature[dependsOn.size()]);
for (CDICoreNature d: ds) {
removeCDIProject(d);
}
- CDICoreNature[] us = usedBy.toArray(new CDICoreNature[0]);
+ CDICoreNature[] us = usedBy.toArray(new CDICoreNature[usedBy.size()]);
for (CDICoreNature u: us) {
u.removeCDIProject(this);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java 2012-02-02 20:04:49 UTC (rev 38401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICorePlugin.java 2012-02-02 21:54:37 UTC (rev 38402)
@@ -182,7 +182,7 @@
public static void fire(CDIProjectChangeEvent event) {
ICDIProjectChangeListener[] ls = null;
synchronized(listeners) {
- ls = listeners.toArray(new ICDIProjectChangeListener[0]);
+ ls = listeners.toArray(new ICDIProjectChangeListener[listeners.size()]);
}
for (ICDIProjectChangeListener l : ls) {
l.projectChanged(event);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-02-02 20:04:49 UTC (rev 38401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-02-02 21:54:37 UTC (rev 38402)
@@ -551,7 +551,7 @@
Set<IFolder> sourceFolders = getSourceFoldersForProjectsSet();
for (IFolder source : sourceFolders) {
IResource beansXml = source.findMember(new Path("/META-INF/beans.xml")); //$NON-NLS-1$
- if(beansXml!=null && beansXml instanceof IFile) {
+ if(beansXml instanceof IFile) {
allBeansXmls.add((IFile)beansXml);
}
}
@@ -1629,7 +1629,7 @@
try {
getValidationContext().addLinkedCoreResource(SHORT_ID, injection.getSourcePath().toOSString(), bean.getResource().getFullPath(), false);
} catch (NullPointerException e) {
- throw new NullPointerException("bean exists=" + bean.getBeanClass().exists() + " resource= " + bean.getResource() + " injection= " + injection.getSourcePath());
+ throw new RuntimeException("bean exists=" + bean.getBeanClass().exists() + " resource= " + bean.getResource() + " injection= " + injection.getSourcePath(),e);
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-02-02 20:04:49 UTC (rev 38401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-02-02 21:54:37 UTC (rev 38402)
@@ -790,7 +790,7 @@
private IMethod findMethod(IFile file, int start){
IJavaElement javaElement = findJavaElement(file, start);
- if(javaElement != null && javaElement instanceof IMethod){
+ if(javaElement instanceof IMethod){
IMethod method = (IMethod)javaElement;
if(!method.isBinary())
return method;
@@ -800,7 +800,7 @@
private IType findTypeWithNoSerializable(IFile file, int start) throws JavaModelException{
IJavaElement javaElement = findJavaElement(file, start);
- if(javaElement != null && javaElement instanceof IType){
+ if(javaElement instanceof IType){
IType type = (IType)javaElement;
if(!type.isBinary()){
String shortName = CDIMarkerResolutionUtils.getShortName(AddSerializableInterfaceMarkerResolution.SERIALIZABLE);
@@ -831,7 +831,7 @@
private TypeAndAnnotation findTypeAndAnnotation(IFile file, int start, String annotationQualifiedName) throws JavaModelException{
IJavaElement javaElement = findJavaElement(file, start);
- if(javaElement != null && javaElement instanceof IType){
+ if(javaElement instanceof IType){
IType type = (IType)javaElement;
if(!type.isBinary()){
IAnnotation annotation = getAnnotation(type, annotationQualifiedName);
@@ -908,7 +908,7 @@
try{
IJavaElement javaElement = findJavaElement(file, start);
- if(javaElement != null && javaElement instanceof IField){
+ if(null && javaElement instanceof IField){
IField field = (IField)javaElement;
if(!Flags.isStatic(field.getFlags()) && !field.isBinary())
return field;
@@ -923,7 +923,7 @@
try{
IJavaElement javaElement = findJavaElement(file, start);
- if(javaElement != null && javaElement instanceof IField){
+ if(javaElement instanceof IField){
IField field = (IField)javaElement;
if(Flags.isPublic(field.getFlags()) && !field.isBinary())
return field;
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38401 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-02 15:04:49 -0500 (Thu, 02 Feb 2012)
New Revision: 38401
Added:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.gitignore
Log:
.gitignore file
Added: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.gitignore
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.gitignore (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/.gitignore 2012-02-02 20:04:49 UTC (rev 38401)
@@ -0,0 +1 @@
+screenshots
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38400 - in trunk/download.jboss.org/jbosstools/updates/requirements: bpmn2-modeler and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-02 14:48:19 -0500 (Thu, 02 Feb 2012)
New Revision: 38400
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.3.xml
trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.2.0...
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6....
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/bpel/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/bpmn2-modeler/bu...
trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
Log:
updated requirements builders for bits closer to SR2
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/bpel/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/bpel/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/bpel/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -29,7 +29,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/0.8.0.v20111120-0746-H98-CI/" name="Eclipse BPEL for Eclipse 3.7 (Not in Indigo)" />
+ <repository location="file:${destination}/0.8.0.v20120202-0453-H135-CI/" name="Eclipse BPEL for Eclipse 3.7 (Not in Indigo)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -39,9 +39,9 @@
</p2.mirror>
<delete>
- <fileset dir="${destination}/0.8.0.v20111120-0746-H98-CI/" includes="**/artifacts.jar, **/contents.jar"/>
+ <fileset dir="${destination}/0.8.0.v20120202-0453-H135-CI/" includes="**/artifacts.jar, **/contents.jar"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.8.0.v20111120-0746-H98-CI/" artifactRepository="file:${destination}/0.8.0.v20111120-0746-H98-CI/" publishartifacts="true" source="${destination}/0.8.0.v20111120-0746-H98-CI/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/0.8.0.v20120202-0453-H135-CI/" artifactRepository="file:${destination}/0.8.0.v20120202-0453-H135-CI/" publishartifacts="true" source="${destination}/0.8.0.v20120202-0453-H135-CI/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/bpmn2-modeler/bu...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/bpmn2-modeler/bu... 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/bpmn2-modeler/bu... 2012-02-02 19:48:19 UTC (rev 38400)
@@ -33,7 +33,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20120105-0830/" name="Eclipse BPEL for Eclipse 3.7 (Not in Indigo)" />
+ <repository location="file:${destination}/201201302358/" name="Eclipse BPEL for Eclipse 3.7 (Not in Indigo)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -43,9 +43,9 @@
</p2.mirror>
<delete>
- <fileset dir="${destination}/20120105-0830/" includes="**/artifacts.jar, **/contents.jar"/>
+ <fileset dir="${destination}/201201302358/" includes="**/artifacts.jar, **/contents.jar"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120105-0830/" artifactRepository="file:${destination}/20120105-0830/" publishartifacts="true" source="${destination}/20120105-0830/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201201302358/" artifactRepository="file:${destination}/201201302358/" publishartifacts="true" source="${destination}/201201302358/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.3.xml (from rev 38399, trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.3.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build-3.5.3.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/ecf/build.xml -Ddestination=/tmp/ecf-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.3/site.p2" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.5.3/" name="ECF plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.3/" artifactRepository="file:${destination}/3.5.3/" publishartifacts="true" source="${destination}/3.5.3/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/ecf/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/ecf/build.xml -Ddestination=/tmp/ecf-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.3/site.p2" />
+ <property name="URL" value="http://download.eclipse.org/rt/ecf/3.5.4/site.p2" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/ecf/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.5.3/" name="ECF plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.5.4/" name="ECF plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.3/" artifactRepository="file:${destination}/3.5.3/" publishartifacts="true" source="${destination}/3.5.3/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.5.4/" artifactRepository="file:${destination}/3.5.4/" publishartifacts="true" source="${destination}/3.5.4/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20111214-1406/" />
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20120201-1336/" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.7.2.M20111214-1406/" name="Eclipse 3.7" />
+ <repository location="file:${destination}/3.7.2.M20120201-1336/" name="Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2.M20111214-1406/" artifactRepository="file:${destination}/3.7.2.M20111214-1406/" publishartifacts="true" source="${destination}/3.7.2.M20111214-1406/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2.M20120201-1336/" artifactRepository="file:${destination}/3.7.2.M20120201-1336/" publishartifacts="true" source="${destination}/3.7.2.M20120201-1336/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.2.0... (from rev 38399, trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.2.0... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build-1.2.0... 2012-02-02 19:48:19 UTC (rev 38400)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/egit/build.xml -Ddestination=/tmp/egit-repo
+ -->
+ <target name="mirror">
+ <property name="URL1" value="http://download.eclipse.org/egit/updates-nightly/" />
+ <property name="URL2" value="http://download.eclipse.org/egit/github/updates-nightly/" />
+ <!--
+ <property name="URL1" value="http://download.eclipse.org/egit/updates-1.1/" />
+ <property name="URL2" value="http://download.eclipse.org/egit/github/updates-1.1/" />
+ -->
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.2.0.201112131611/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/1.2.0.201112131611/" name="egit + github plugins for Eclipse 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.2.0.201112131611/" artifactRepository="file:${destination}/1.2.0.201112131611/" publishartifacts="true" source="${destination}/1.2.0.201112131611/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -22,11 +22,11 @@
<property name="URL1" value="http://download.eclipse.org/egit/updates-1.1/" />
<property name="URL2" value="http://download.eclipse.org/egit/github/updates-1.1/" />
-->
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.2.0.201112131611/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/egit/1.3.0.201202021740/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/1.2.0.201112131611/" name="egit + github plugins for Eclipse 3.7" />
+ <repository location="file:${destination}/1.3.0.201202021740/" name="egit + github plugins for Eclipse 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -35,6 +35,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.2.0.201112131611/" artifactRepository="file:${destination}/1.2.0.201112131611/" publishartifacts="true" source="${destination}/1.2.0.201112131611/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.3.0.201202021740/" artifactRepository="file:${destination}/1.3.0.201202021740/" publishartifacts="true" source="${destination}/1.3.0.201202021740/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/emf/build.xml -Ddestination=/tmp/emf-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/base/M20111028..." />
- <property name="URL2" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/core/M20111031..." />
+ <property name="URL1" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/base/R20120127..." />
+ <property name="URL2" value="http://download.eclipse.org/modeling/emf/emf/updates/2.7.x/core/R20120130..." />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/emf/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.7.2.v20111031-1121/" name="EMF plugins for Eclipse 3.7" />
+ <repository location="file:${destination}/2.7.2.v20120130-0943/" name="EMF plugins for Eclipse 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -31,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7.2.v20111031-1121/" artifactRepository="file:${destination}/2.7.2.v20111031-1121/" publishartifacts="true" source="${destination}/2.7.2.v20111031-1121/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.7.2.v20120130-0943/" artifactRepository="file:${destination}/2.7.2.v20120130-0943/" publishartifacts="true" source="${destination}/2.7.2.v20120130-0943/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -16,14 +16,14 @@
-f ~/RHDS/updates/requirements/indigo/build.xml -Ddestination=/tmp/indigo-repo
-->
<target name="mirror">
- <!-- <property name="URL" value="http://download.eclipse.org/releases/indigo/201109230900/" /> -->
+ <!-- <property name="URL" value="http://download.eclipse.org/releases/indigo/201202012328-SR1-M/" /> -->
<property name="URL" value="http://download.eclipse.org/releases/maintenance/" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/201109230900/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/201112221140-SR1-M/" name="Indigo 201112221140-SR1-M" />
+ <repository location="file:${destination}/201202012328-SR1-M/" name="Indigo 201202012328-SR1-M" />
<source>
<repository location="${URL}" />
</source>
@@ -31,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112221140-SR1-M/" artifactRepository="file:${destination}/201112221140-SR1-M/" publishartifacts="true" source="${destination}/201112221140-SR1-M/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201202012328-SR1-M/" artifactRepository="file:${destination}/201202012328-SR1-M/" publishartifacts="true" source="${destination}/201202012328-SR1-M/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... (from rev 38399, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6.... 2012-02-02 19:48:19 UTC (rev 38400)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
+ -->
+ <target name="mirror">
+ <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.4/v20111118-0100/" />
+ <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
+ <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
+ <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.4/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.6.4.v20111118-0100" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+
+ <!-- available on indigo site but older version (3.6.2) -->
+ <iu id="org.eclipse.mylyn_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.feature.group" />
+ <iu id="org.eclipse.mylyn.context_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.java_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.team_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
+
+ <!-- not on indigo -->
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.git.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
+ <!-- these last two are described as "obsolete" on the update site -->
+ <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.4.v20111118-0100/" artifactRepository="file:${destination}/3.6.4.v20111118-0100/" publishartifacts="true" source="${destination}/3.6.4.v20111118-0100/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -19,15 +19,15 @@
<!-- core mylyn, if not on Indigo site; includes Bugzilla -->
<!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
<!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
- <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.4/v20111118-0100/" />
+ <property name="URL1" value="http://download.eclipse.org/mylyn/drops/3.6.5/I20120201-0822/" />
<!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
<!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.4/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6.5/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.6.4.v20111118-0100" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.6.5.I20120201-0822" name="mylyn plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -58,6 +58,6 @@
<iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.4.v20111118-0100/" artifactRepository="file:${destination}/3.6.4.v20111118-0100/" publishartifacts="true" source="${destination}/3.6.4.v20111118-0100/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6.5.I20120201-0822/" artifactRepository="file:${destination}/3.6.5.I20120201-0822/" publishartifacts="true" source="${destination}/3.6.5.I20120201-0822/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-02-02 17:40:49 UTC (rev 38399)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2012-02-02 19:48:19 UTC (rev 38400)
@@ -23,12 +23,12 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.2/M-3.3.2-20120..." />
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.2/M-3.3.2-20120..." />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.3.2-20120112170214/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <repository location="file:${destination}/3.3.2-20120126205453/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
<source>
<repository location="${URL}" />
</source>
@@ -37,6 +37,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.2-20120112170214/" artifactRepository="file:${destination}/3.3.2-20120112170214/" publishartifacts="true" source="${destination}/3.3.2-20120112170214/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.2-20120126205453/" artifactRepository="file:${destination}/3.3.2-20120126205453/" publishartifacts="true" source="${destination}/3.3.2-20120126205453/" compress="${compress}" />
</target>
</project>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r38399 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-02-02 12:40:49 -0500 (Thu, 02 Feb 2012)
New Revision: 38399
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectPlugin.java
Log:
[JBIDE-10726] Cleanup after moving the ESB visualizer into the project.ui project
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectPlugin.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectPlugin.java 2012-02-02 17:39:09 UTC (rev 38398)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectPlugin.java 2012-02-02 17:40:49 UTC (rev 38399)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2012 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,
12 years, 3 months
- 1
- 0