JBoss Tools SVN: r32940 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-07-15 08:03:51 -0400 (Fri, 15 Jul 2011)
New Revision: 32940
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragSource.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropTarget.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hashParam.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeSelectionChangeListener.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeToggleListener.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/validator.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8950 , JUnits far invisible elements were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragSource.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragSource.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragSource.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <div>
+ <rich:dragSource id="dragSource" type="ttt" dragValue="vvv"/>
+ </div>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropTarget.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropTarget.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropTarget.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <div>
+ <rich:dropTarget id="dropTarget" acceptedTypes="php" dropValue="PHP"
+ dropListener="dragDropEventBean"
+ render="phptable, src"/>
+ </div>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hashParam.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hashParam.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hashParam.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <rich:hashParam id="hashParam">
+ <f:param name="width" value="500" />
+ <f:param name="height" value="300" />
+ <f:param name="minWidth" value="300" />
+ <f:param name="minHeight" value="150" />
+ </rich:hashParam>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeSelectionChangeListener.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeSelectionChangeListener.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeSelectionChangeListener.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <rich:treeSelectionChangeListener id="treeSelectionChangeListener" />
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeToggleListener.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeToggleListener.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeToggleListener.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <rich:treeToggleListener id="treeToggleListener" />
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/validator.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/validator.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/validator.xhtml 2011-07-15 12:03:51 UTC (rev 32940)
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <h:inputText value="#{userBean.name}" id="name">
+ <f:validateLength minimum="3" maximum="8" />
+ <f:validateRequired />
+ <rich:validator id="validator" />
+ </h:inputText>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2011-07-15 11:14:49 UTC (rev 32939)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2011-07-15 12:03:51 UTC (rev 32940)
@@ -420,6 +420,30 @@
performContentTest("components/togglePanelItem.xhtml");//$NON-NLS-1$
}
+ public void testDragSource() throws Throwable {
+ performInvisibleTagTest("components/dragSource.xhtml", "dragSource"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testDropTarget() throws Throwable {
+ performInvisibleTagTest("components/dropTarget.xhtml", "dropTarget"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testHashParam() throws Throwable {
+ performInvisibleTagTest("components/hashParam.xhtml", "hashParam"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testTreeSelectionChangeListener() throws Throwable {
+ performInvisibleTagTest("components/treeSelectionChangeListener.xhtml", "treeSelectionChangeListener"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testTreeToggleListener() throws Throwable {
+ performInvisibleTagTest("components/treeToggleListener.xhtml", "treeToggleListener"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testValidator() throws Throwable {
+ performInvisibleTagTest("components/validator.xhtml", "validator"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
@Override
protected String getTestProjectName() {
return RichFacesAllTests.IMPORT_PROJECT_NAME;
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32939 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-15 07:14:49 -0400 (Fri, 15 Jul 2011)
New Revision: 32939
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
Log:
JBIDE-9349 - updating default execution environment
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2011-07-15 11:09:38 UTC (rev 32938)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2011-07-15 11:14:49 UTC (rev 32939)
@@ -116,7 +116,9 @@
public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
String typeId = rtType.getId();
- if( typeId.equals(IConstants.EAP_50) || typeId.equals(IConstants.AS_60)) {
+ if( typeId.equals(IConstants.EAP_50)
+ || typeId.equals(IConstants.AS_60)
+ || typeId.equals(IConstants.AS_70)) {
return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$
}
return EnvironmentsManager.getDefault().getEnvironment("J2SE-1.4"); //$NON-NLS-1$
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32938 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-15 07:09:38 -0400 (Fri, 15 Jul 2011)
New Revision: 32938
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/VisualPartAbstractHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-9323 : Possibility to contribute on vpe toolbar in eclipse
- Applied slightly changed path provided by Maxim Areshkau
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/VisualPartAbstractHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/VisualPartAbstractHandler.java 2011-07-15 11:09:03 UTC (rev 32937)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/VisualPartAbstractHandler.java 2011-07-15 11:09:38 UTC (rev 32938)
@@ -29,6 +29,7 @@
*/
public abstract class VisualPartAbstractHandler extends AbstractHandler
implements IElementUpdater {
+ public static final String VPE_CATEGORY_ID = "org.jboss.tools.vpe.category"; //$NON-NLS-1$
@Override
public void setEnabled(Object evaluationContext) {
boolean enabled = false;
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32937 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-15 07:09:03 -0400 (Fri, 15 Jul 2011)
New Revision: 32937
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://issues.jboss.org/browse/JBIDE-9323 : Possibility to contribute on vpe toolbar in eclipse
- Applied slightly changed path provided by Maxim Areshkau
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-07-15 09:58:30 UTC (rev 32936)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-07-15 11:09:03 UTC (rev 32937)
@@ -13,10 +13,13 @@
import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -136,6 +139,7 @@
import org.jboss.tools.vpe.handlers.ShowBundleAsELHandler;
import org.jboss.tools.vpe.handlers.ShowNonVisualTagsHandler;
import org.jboss.tools.vpe.handlers.ShowTextFormattingHandler;
+import org.jboss.tools.vpe.handlers.VisualPartAbstractHandler;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
import org.jboss.tools.vpe.resref.core.CSSReferenceList;
@@ -211,6 +215,7 @@
private UIJob reinitJob;
private IZoomEventManager zoomEventManager;
private VpeDropWindow dropWindow = null;
+ private static List<String> vpeCategoryCommands = null;
/**
* Added by Max Areshkau JBIDE-675, stores information about modification
@@ -2473,20 +2478,38 @@
}
}
- /**
- *
- */
+
public void refreshCommands(){
ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
- commandService.refreshElements(ShowTextFormattingHandler.COMMAND_ID, null);
- commandService.refreshElements(RotateEditorsHandler.COMMAND_ID, null);
- commandService.refreshElements(ShowNonVisualTagsHandler.COMMAND_ID, null);
- commandService.refreshElements(ShowBundleAsELHandler.COMMAND_ID, null);
- commandService.refreshElements(ShowBorderHandler.COMMAND_ID, null);
- commandService.refreshElements(RefreshHandler.COMMAND_ID, null);
- commandService.refreshElements(PreferencesHandler.COMMAND_ID, null);
- commandService.refreshElements(PageDesignOptionsHandler.COMMAND_ID, null);
+ .getWorkbench().getService(ICommandService.class);
+
+ //just refresh state of commands
+ for (String commandId : getVpeCategoryCommands()) {
+ commandService.refreshElements(commandId, null);
+ }
+ }
+
+ private List<String> getVpeCategoryCommands() {
+ ICommandService commandService = (ICommandService) PlatformUI
+ .getWorkbench().getService(ICommandService.class);
+
+ //init VPE Commands List if its has not been initialized
+ if (vpeCategoryCommands == null) {
+ vpeCategoryCommands = new ArrayList<String>();
+ Command [] definedCommands = commandService.getDefinedCommands();
+ for (Command command : definedCommands) {
+ try {
+ if(VisualPartAbstractHandler.VPE_CATEGORY_ID.equals(command.getCategory().getId())){
+ //collecting vpe category commands
+ vpeCategoryCommands.add(command.getId());
+ }
+ } catch (NotDefinedException e) {
+ VpePlugin.reportProblem(e);
+ }
+ }
+ }
+
+ return vpeCategoryCommands;
}
/**
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32936 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-15 05:58:30 -0400 (Fri, 15 Jul 2011)
New Revision: 32936
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-9243 - adding dialog for starting a server when another is already running
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -33,6 +33,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler;
+import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.ServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
@@ -317,4 +318,17 @@
JMX_RUNNER_NOT_FOUND = new Object();
return null;
}
+
+
+ // TODO Replace with extension point or cleaner API
+ // Should have an array of possible handlers
+ // Should ask each handler if they 'accept' this handler, etc
+ private IServerAlreadyStartedHandler defaultAlreadyStartedHandler;
+ public IServerAlreadyStartedHandler getAlreadyStartedHandler(IServer server) {
+ return defaultAlreadyStartedHandler;
+ }
+ public void setAlreadyStartedHandler(IServerAlreadyStartedHandler handler) {
+ defaultAlreadyStartedHandler = handler;
+ }
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerAlreadyStartedHandler.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server;
+
+import org.eclipse.wst.server.core.IServer;
+
+public interface IServerAlreadyStartedHandler {
+ public static int CONTINUE_STARTUP = 1;
+ public static int ONLY_CONNECT = 2;
+ public static int CANCEL = 3;
+
+ /**
+ * Is this handler capable of handling this server?
+ * @param server
+ * @return
+ */
+ public boolean accepts(IServer server);
+
+ /**
+ * Handle the prompt for this server
+ *
+ * @param server
+ * @return One of the constants of this interface
+ */
+ public int promptForBehaviour(IServer server);
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -27,13 +27,18 @@
import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.jst.server.core.ServerProfilerDelegate;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
+import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
/**
* @author Rob Stryker
@@ -51,16 +56,46 @@
jbsBehavior.setServerStarted();
return false;
}
- boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
+ boolean started = isServerStarted(jbsBehavior);
if (started) {
- jbsBehavior.setServerStarting();
- jbsBehavior.setServerStarted();
- return false;
+ return handleAlreadyStartedScenario(jbsBehavior);
}
return true;
}
+ /*
+ * A solution needs to be found here.
+ * Should ideally use the poller that the server says is its poller,
+ * but some pollers such as timeout poller
+ */
+ protected boolean isServerStarted(DelegatingServerBehavior jbsBehavior) {
+ IServerStatePoller poller = PollThreadUtils.getPoller(IServerStatePoller.SERVER_UP, jbsBehavior.getServer());
+
+ // Need to be able to FORCE the poller to poll immediately
+ if( poller == null || !(poller instanceof IServerStatePoller2))
+ poller = new WebPortPoller();
+ boolean started = ((IServerStatePoller2)poller).getCurrentStateSynchronous(jbsBehavior.getServer());
+ return started;
+ }
+
+ protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior) {
+ IServerAlreadyStartedHandler handler = ExtensionManager.getDefault().getAlreadyStartedHandler(jbsBehavior.getServer());
+ if( handler != null ) {
+ int handlerResult = handler.promptForBehaviour(jbsBehavior.getServer());
+ if( handlerResult == IServerAlreadyStartedHandler.CONTINUE_STARTUP) {
+ return true;
+ }
+ if( handlerResult == IServerAlreadyStartedHandler.CANCEL) {
+ return false;
+ }
+ }
+ // force server to started mode
+ jbsBehavior.setServerStarting();
+ jbsBehavior.setServerStarted();
+ return false;
+ }
+
public void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// override me
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -33,9 +33,11 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.ui.internal.ServerUIPreferences;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.jboss.ide.eclipse.as.ui.console.ShowConsoleServerStateListener;
+import org.jboss.ide.eclipse.as.ui.dialogs.ServerAlreadyStartedDialog.ServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathRuntimeListener;
import org.jboss.ide.eclipse.as.ui.wizards.JBInitialSelectionProvider;
import org.osgi.framework.BundleContext;
@@ -87,12 +89,14 @@
UnitedServerListenerManager.getDefault().addListener(ShowConsoleServerStateListener.getDefault());
ServerCore.addServerLifecycleListener(selectionProvider);
ServerCore.addRuntimeLifecycleListener(XPathRuntimeListener.getDefault());
+ ExtensionManager.getDefault().setAlreadyStartedHandler(new ServerAlreadyStartedHandler());
}
/**
* This method is called when the plug-in is stopped
*/
public void stop(BundleContext context) throws Exception {
+ ExtensionManager.getDefault().setAlreadyStartedHandler(null);
ServerCore.removeRuntimeLifecycleListener(XPathRuntimeListener.getDefault());
ServerCore.removeServerLifecycleListener(selectionProvider);
UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -251,6 +251,13 @@
public static String ChangeTimestampServerListDialog_Title;
public static String ChangeTimestampServerListDialog_Message;
+ public static String ServerAlreadyStartedDialog_Message;
+ public static String ServerAlreadyStartedDialog_Title;
+ public static String ServerAlreadyStartedDialog_Desc;
+ public static String ServerAlreadyStartedDialog_Connect;
+ public static String ServerAlreadyStartedDialog_Launch;
+
+
static {
NLS.initializeMessages(BUNDLE_NAME,
Messages.class);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-15 09:48:07 UTC (rev 32935)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-15 09:58:30 UTC (rev 32936)
@@ -222,3 +222,9 @@
#Change Timestamp
ChangeTimestampServerListDialog_Title=Touch project
ChangeTimestampServerListDialog_Message=Project {0} has no files to touch.\nSelect servers in which to republish the project.
+
+ServerAlreadyStartedDialog_Message=An application server may already be running on host {0}.
+ServerAlreadyStartedDialog_Title=Server already running on {0}
+ServerAlreadyStartedDialog_Desc=Launching an additional server when one is already running may \nmake some parts of the tools not function properly. \n\n Would you like to:
+ServerAlreadyStartedDialog_Connect=Set the server adapter to 'started', but do not launch
+ServerAlreadyStartedDialog_Launch=Launch a new instance anyway
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ServerAlreadyStartedDialog.java 2011-07-15 09:58:30 UTC (rev 32936)
@@ -0,0 +1,112 @@
+/*******************************************************************************
+* Copyright (c) 2011 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.dialogs;
+
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
+
+public class ServerAlreadyStartedDialog extends TitleAreaDialog {
+ public static class ServerAlreadyStartedHandler implements IServerAlreadyStartedHandler {
+ public boolean accepts(IServer server) {
+ return true;
+ }
+ public int promptForBehaviour(final IServer server) {
+ final int[] result = new int[1];
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ ServerAlreadyStartedDialog d = new ServerAlreadyStartedDialog(server,Display.getDefault().getActiveShell());
+ int dResult = d.open();
+ if( dResult == Window.CANCEL ) {
+ result[0] = IServerAlreadyStartedHandler.CANCEL;
+ } else {
+ result[0] = d.launch ? IServerAlreadyStartedHandler.CONTINUE_STARTUP : IServerAlreadyStartedHandler.ONLY_CONNECT;
+ }
+ }
+ });
+ return result[0];
+ }
+ }
+
+ private IServer server;
+ private boolean launch;
+ public ServerAlreadyStartedDialog(IServer server, Shell parentShell) {
+ super(parentShell);
+ this.server = server;
+ }
+ @Override
+ protected Control createContents(Composite parent) {
+ Control c = super.createContents(parent);
+ setMessage(NLS.bind(Messages.ServerAlreadyStartedDialog_Message, server.getHost()), IMessageProvider.WARNING );
+ setTitle(NLS.bind(Messages.ServerAlreadyStartedDialog_Title, server.getHost()));
+ getShell().setText(NLS.bind(Messages.ServerAlreadyStartedDialog_Title, server.getHost()));
+ return c;
+ }
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ // create OK and Cancel buttons by default
+ super.createButtonsForButtonBar(parent);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite main = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
+ main.setLayoutData(new GridData(GridData.FILL_BOTH));
+ main.setLayout(new FormLayout());
+
+ Label desc = new Label(main, SWT.NONE);
+ desc.setText(Messages.ServerAlreadyStartedDialog_Desc);
+ Button connectButton = new Button(main, SWT.RADIO);
+ connectButton.setText(Messages.ServerAlreadyStartedDialog_Connect);
+ Button launchButton = new Button(main, SWT.RADIO);
+ launchButton.setText(Messages.ServerAlreadyStartedDialog_Launch);
+
+ connectButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ launch = false;
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+ launchButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ launch = true;
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+
+ desc.setLayoutData(UIUtil.createFormData2(0, 5, null, 0, 0, 5, 100, -5));
+ connectButton.setLayoutData(UIUtil.createFormData2(desc, 5, null, 0, 0, 5, 100, -5));
+ launchButton.setLayoutData(UIUtil.createFormData2(connectButton, 5, null, 0, 0, 5, 100, -5));
+
+ connectButton.setSelection(true);
+ return main;
+ }
+
+}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32935 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-15 05:48:07 -0400 (Fri, 15 Jul 2011)
New Revision: 32935
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
Log:
/JBIDE-9350 - new API addition for pollers
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-07-15 09:24:06 UTC (rev 32934)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-07-15 09:48:07 UTC (rev 32935)
@@ -9,13 +9,15 @@
import java.util.Properties;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-public class WebPortPoller implements IServerStatePoller {
+public class WebPortPoller implements IServerStatePoller2 {
public static final String WEB_POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.WebPoller"; //$NON-NLS-1$
private IServer server;
@@ -66,7 +68,7 @@
return onePing(getURL(server));
}
- public static boolean onePing(String url) {
+ private static boolean onePing(String url) {
try {
URL pingUrl = new URL(url);
URLConnection conn = pingUrl.openConnection();
@@ -117,4 +119,8 @@
return TIMEOUT_BEHAVIOR_FAIL;
}
+ public boolean getCurrentStateSynchronous(IServer server) {
+ return onePing(server);
+ }
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java 2011-07-15 09:48:07 UTC (rev 32935)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server;
+
+import org.eclipse.wst.server.core.IServer;
+
+/**
+ * This interface is an addition to the IServerStatePoller
+ * for pollers which can be forced immediately to poll the server.
+ * Some pollers, such as timeout poller or processTerminated poller,
+ * have no such ability.
+ */
+public interface IServerStatePoller2 extends IServerStatePoller {
+ /**
+ * Get the current state of the server via a forced
+ * poll request.
+ *
+ * This API is required because the structure of the poller API
+ * allows some pollers to launch their own threads, and respond to
+ * getState() as the answer comes in.
+ *
+ * This method, in contrast, initiates an immediate and synchronous
+ * poll attempt to determine the current state.
+ *
+ * @return IServerStatePoller.SERVER_UP or SERVER_DOWN
+ */
+ public boolean getCurrentStateSynchronous(IServer server);
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-15 09:24:06 UTC (rev 32934)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-15 09:48:07 UTC (rev 32935)
@@ -19,13 +19,14 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
/**
* @author André Dietisheim
*/
-public class JBoss7ManagerServicePoller implements IServerStatePoller {
+public class JBoss7ManagerServicePoller implements IServerStatePoller2 {
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"; //$NON-NLS-1$
private IServer server;
@@ -125,4 +126,13 @@
public int getTimeoutBehavior() {
return TIMEOUT_BEHAVIOR_FAIL;
}
+
+ public boolean getCurrentStateSynchronous(IServer server) {
+ try {
+ JBoss7ServerState state = service.getServerState(getServer().getHost(), getManagementPort());
+ return state == JBoss7ServerState.RUNNING ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN;
+ } catch(Exception e) {
+ }
+ return IServerStatePoller.SERVER_DOWN;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-07-15 09:24:06 UTC (rev 32934)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-07-15 09:48:07 UTC (rev 32935)
@@ -30,6 +30,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -40,7 +41,7 @@
* @author Rob rob.stryker(a)redhat.com
*
*/
-public class JMXPoller implements IServerStatePoller {
+public class JMXPoller implements IServerStatePoller2 {
public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; //$NON-NLS-1$
public static final int JMXPOLLER_CODE = IEventCodes.JMXPOLLER_CODE;
@@ -75,20 +76,13 @@
launchJMXPoller();
}
- private class JMXPollerRunnable implements IJMXRunnable {
+ private static class JMXPollerRunnable implements IJMXRunnable {
+ private boolean result;
public void run(MBeanServerConnection connection) throws Exception {
Object attInfo = connection.getAttribute(
new ObjectName(IJBossRuntimeConstants.SYSTEM_MBEAN),
IJBossRuntimeConstants.STARTED_METHOD);
- boolean b = ((Boolean) attInfo).booleanValue();
- started = b ? STATE_STARTED : STATE_TRANSITION;
- done = b;
- if( !startingFound ) {
- startingFound = true;
- IStatus s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID,
- JMXPOLLER_CODE|started, Messages.ServerStarting, null);
- log(s);
- }
+ result = ((Boolean) attInfo).booleanValue();
}
}
@@ -100,6 +94,14 @@
while( !done && !canceled) {
try {
runner.run(runnable);
+ started = runnable.result ? STATE_STARTED : STATE_TRANSITION;
+ done = runnable.result;
+ if( !startingFound ) {
+ startingFound = true;
+ IStatus s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID,
+ JMXPOLLER_CODE|started, Messages.ServerStarting, null);
+ log(s);
+ }
} catch(CoreException ce) {
handleException(ce.getCause());
}
@@ -247,4 +249,20 @@
if( !canceled )
ServerLogger.getDefault().log(server,s);
}
+
+ public boolean getCurrentStateSynchronous(IServer server) {
+ JMXClassLoaderRepository.getDefault().addConcerned(server, this);
+ JMXPollerRunnable runnable2 = new JMXPollerRunnable();
+ JMXSafeRunner runner2 = new JMXSafeRunner(server);
+ try {
+ runner2.run(runnable);
+ int started2 = runnable2.result ? STATE_STARTED : STATE_TRANSITION;
+ if( started2 == STATE_STARTED )
+ return IServerStatePoller.SERVER_UP;
+ } catch(CoreException ce) {
+ } finally {
+ JMXClassLoaderRepository.getDefault().removeConcerned(server, this);
+ }
+ return IServerStatePoller.SERVER_DOWN;
+ }
}
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32934 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-15 05:24:06 -0400 (Fri, 15 Jul 2011)
New Revision: 32934
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] cleaned implementation (removed unnecessary additional check, renamed wrong named local var)
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 2011-07-15 04:11:56 UTC (rev 32933)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-15 09:24:06 UTC (rev 32934)
@@ -48,23 +48,17 @@
@SuppressWarnings("unchecked")
public static <ADAPTER> ADAPTER checkedGetServerAdapter(IServer server, Class<ADAPTER> behaviorClass) throws CoreException {
- ADAPTER serverBehavior = (ADAPTER) server.loadAdapter(behaviorClass, new NullProgressMonitor());
- if (serverBehavior == null) {
+ ADAPTER adapter = (ADAPTER) server.loadAdapter(behaviorClass, new NullProgressMonitor());
+ if (adapter == null) {
throw new CoreException(
new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CouldNotFindServerBehavior, server.getName())));
}
- return serverBehavior;
+ return adapter;
}
public static IJBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws CoreException {
- IJBossBehaviourDelegate delegate = checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate();
- if (delegate == null) {
- throw new CoreException(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.CouldNotFindServerBehavior, server.getName())));
- }
- return delegate;
+ return checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate();
}
@Deprecated
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32933 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-15 00:11:56 -0400 (Fri, 15 Jul 2011)
New Revision: 32933
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
add missing orbit and m2e deps to TPs; merge changes from trunk to 32x branch
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 03:59:42 UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 04:11:56 UTC (rev 32933)
@@ -12,25 +12,25 @@
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
<unit id="org.apache.commons.io" version="2.0.1.v201101200200"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15 04:11:56 UTC (rev 32933)
@@ -30,6 +30,19 @@
<source>
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</source>
+<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.jdom" version=""/>
<iu id="org.apache.oro" version=""/>
@@ -154,18 +167,6 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
-<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
-<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
-<iu id="ch.qos.logback.classic" version=""/>
-<iu id="ch.qos.logback.core" version=""/>
-<iu id="ch.qos.logback.slf4j" version=""/>
-<iu id="org.slf4j.api" version=""/>
-<iu id="com.ning.async-http-client" version=""/>
-<iu id="org.jboss.netty" version=""/>
-<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
-<iu id="org.eclipse.equinox.p2.discovery" version=""/>
-<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
-<iu id="org.eclipse.net4j.jms.api" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 03:59:42 UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 04:11:56 UTC (rev 32933)
@@ -15,25 +15,25 @@
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:59:42 UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 04:11:56 UTC (rev 32933)
@@ -13,26 +13,27 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.11.1.20101108-1810"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106061504"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32932 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-14 23:59:42 -0400 (Thu, 14 Jul 2011)
New Revision: 32932
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/unified.target
branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
Log:
add missing orbit and m2e deps to TPs; merge changes from trunk to 32x branch
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 03:59:42 UTC (rev 32932)
@@ -1,15 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="jbds">
+<target includeMode="feature" name="jbds4">
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- Pro tip: to convert
- from org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
- to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
- using vi, apply this transform:
- :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
- -->
+ <!-- Pro tip: to convert
+ from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
+ using vi, apply this transform:
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
+ -->
- <!-- Orbit bundles -->
+ <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+
+ <!-- Orbit bundles -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201101200200"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
@@ -155,10 +177,6 @@
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201101200200"/>
-
- <repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</location>
</locations>
- <!-- <includeBundles><plugin id="org.apache.commons.io"/></includeBundles> -->
</target>
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932)
@@ -30,6 +30,12 @@
<source>
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</source>
+<iu id="javax.wsdl" version=""/>
+<iu id="org.jdom" version=""/>
+<iu id="org.apache.oro" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.apache.commons.io" version=""/>
<iu id="org.hamcrest" version=""/>
<iu id="org.hamcrest.core" version=""/>
<iu id="org.hamcrest.text" version=""/>
@@ -148,7 +154,18 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
-<iu id="org.apache.commons.io" version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 03:59:42 UTC (rev 32932)
@@ -13,6 +13,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
@@ -27,13 +28,17 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
- <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 -->
- <!--
- <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
- -->
+ <!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932)
@@ -31,8 +31,6 @@
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl..."/>
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</source>
-<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
-<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
@@ -47,8 +45,15 @@
<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
+<iu id="org.jdom" version=""/>
<iu id="org.apache.oro" version=""/>
-<iu id="org.jdom" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.hamcrest" version=""/>
+<iu id="org.hamcrest.core" version=""/>
+<iu id="org.hamcrest.text" version=""/>
+<iu id="org.hamcrest.library" version=""/>
+<iu id="org.hamcrest.integration" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group" version=""/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:59:42 UTC (rev 32932)
@@ -27,13 +27,17 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
- <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 -->
- <!--
- <unit id="javax.wsdl" version="1.6.2.v201005080631"/>
- -->
+ <!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-07-15 03:53:51 UTC (rev 32931)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932)
@@ -31,8 +31,6 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</source>
-<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
-<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
@@ -47,8 +45,14 @@
<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
+<iu id="org.jdom" version=""/>
<iu id="org.apache.oro" version=""/>
-<iu id="org.jdom" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.hamcrest" version=""/>
+<iu id="org.hamcrest.core" version=""/>
+<iu id="org.hamcrest.library" version=""/>
+<iu id="org.hamcrest.integration" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group" version=""/>
14 years, 9 months
- 1
- 0
JBoss Tools SVN: r32931 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-14 23:53:51 -0400 (Thu, 14 Jul 2011)
New Revision: 32931
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
fix comments and spacing to be consistent w/ 32x branch
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-07-15 01:01:59 UTC (rev 32930)
+++ trunk/build/target-platform/jbds.target 2011-07-15 03:53:51 UTC (rev 32931)
@@ -15,7 +15,6 @@
<!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/RC2/"/> -->
<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/RC2/"/> -->
-
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
@@ -48,13 +47,9 @@
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <!-- should be newer M6 versions
- :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
- -->
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <!-- next two updated in M6 -->
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7CCcNBGNCWHeDYRS"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgOTs0y-rHcC"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/>
@@ -64,7 +59,6 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <!-- next one updated in M6 -->
<unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s73553C655B63"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
@@ -89,11 +83,6 @@
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <!-- remove SDK features
- <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.9.0.v201010181130-7I9O-FE9JfxXy1iz06uC_FrlImH-"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.9.0.v201010181130-7PA3-FEPPYupCWLDHfffcc2LJx83"/>
- -->
-
<!-- XSD 2.7 -->
<unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20110530-1010"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110530-1010"/>
@@ -118,9 +107,8 @@
<unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuJsMLpUla9B15B"/>
<!-- WTP SDK 3.3 -->
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.0.v201104050000-6--AkF7BB7PAN7778"/>
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.0.v201104050000-6--AkF7BB7PAN7778"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553C4G3333"/>
-
<unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.0.v201104180000-7J7F2F7RZHQPImVMHbv_cF"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201105020000-7R7F78FC7sRdiSRbwTQlYJ7"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
@@ -165,7 +153,7 @@
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.0.v201103310043-7A7J-CcNBGOCUIWFYMf"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7T7YFRSFIqUoIrvYEvBiPGJXGZNg"/>
- <!-- RCP 3.6.1 -->
+ <!-- RCP 3.7 -->
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110524-7P7NFUFFLWUl76mam1"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.1.v20110502-1955-6-Bg9JXOePwKUTU7X-ueTqMsz00-"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqnbNsPXLa3"/>
@@ -179,7 +167,7 @@
<!-- PDE -->
<unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYtj_9RfO7"/>
- <!-- RSE SDK 3.2.1 -->
+ <!-- RSE SDK 3.3 -->
<unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
<unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-07-15 01:01:59 UTC (rev 32930)
+++ trunk/build/target-platform/multiple.target 2011-07-15 03:53:51 UTC (rev 32931)
@@ -105,13 +105,9 @@
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <!-- should be newer M6 versions
- :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
- -->
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <!-- next two updated in M6 -->
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7CCcNBGNCWHeDYRS"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgOTs0y-rHcC"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/>
@@ -121,7 +117,6 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <!-- next one updated in M6 -->
<unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s73553C655B63"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-07-15 01:01:59 UTC (rev 32930)
+++ trunk/build/target-platform/unified.target 2011-07-15 03:53:51 UTC (rev 32931)
@@ -105,13 +105,9 @@
<!-- DTP 1.9 -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <!-- should be newer M6 versions
- :%s/<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkp9kfkUGJsrNYJ73"\/> /<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"\/> /g
- -->
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>
- <!-- next two updated in M6 -->
<unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7CCcNBGNCWHeDYRS"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgOTs0y-rHcC"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/>
@@ -121,7 +117,6 @@
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
<unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
- <!-- next one updated in M6 -->
<unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s73553C655B63"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/>
14 years, 9 months
- 1
- 0