JBoss Tools SVN: r38979 - in branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-22 08:34:07 -0500 (Wed, 22 Feb 2012)
New Revision: 38979
Added:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java
Removed:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-10989 - Disconnect should be Delete
https://issues.jboss.org/browse/JBIDE-10989
Added: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java (rev 0)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-02-22 13:34:07 UTC (rev 38979)
@@ -0,0 +1,25 @@
+package org.jboss.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.jboss.tools.openshift.express.internal.core.console.UserModel;
+import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+
+import com.openshift.express.client.IUser;
+
+public class DeleteConnectionAction extends AbstractAction {
+
+ public DeleteConnectionAction() {
+ super(OpenShiftExpressUIMessages.DELETE_CONNECTION_ACTION);
+ }
+
+ @Override
+ public void run() {
+ final ITreeSelection treeSelection = (ITreeSelection)selection;
+ if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) {
+ final IUser user = (IUser) treeSelection.getFirstElement();
+ UserModel.getDefault().removeUser(user);
+ }
+ }
+
+
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-22 13:31:24 UTC (rev 38978)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-22 13:34:07 UTC (rev 38979)
@@ -6,6 +6,7 @@
private static final String BUNDLE_NAME = OpenShiftExpressUIMessages.class.getName();
+
static {
NLS.initializeMessages(BUNDLE_NAME, OpenShiftExpressUIMessages.class);
}
@@ -40,4 +41,5 @@
public static String REFRESH_VIEWER_ACTION;
+ public static String DELETE_CONNECTION_ACTION;
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-22 13:31:24 UTC (rev 38978)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-22 13:34:07 UTC (rev 38979)
@@ -16,3 +16,6 @@
SHOW_PROPERTIES_VIEW_ACTION=Properties
REFRESH_VIEWER_ACTION=Refresh
+DELETE_CONNECTION_ACTION=Delete
+
+
Copied: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java (from rev 38935, branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java)
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java (rev 0)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java 2012-02-22 13:34:07 UTC (rev 38979)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.viewer.actionProvider;
+
+import org.jboss.tools.openshift.express.internal.ui.action.DeleteConnectionAction;
+
+
+
+/**
+ * @author Rob Stryker
+ */
+public class DeleteConnectionActionProvider extends AbstractActionProvider {
+
+
+
+ public DeleteConnectionActionProvider() {
+ super(new DeleteConnectionAction(), "group.edition");
+ }
+
+}
Deleted: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-22 13:31:24 UTC (rev 38978)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-22 13:34:07 UTC (rev 38979)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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.tools.openshift.express.internal.ui.viewer.actionProvider;
-
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.jboss.tools.openshift.express.internal.core.console.UserModel;
-import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction;
-
-import com.openshift.express.client.IUser;
-
-/**
- * @author Rob Stryker
- */
-public class RemoveConnectionActionProvider extends AbstractActionProvider {
-
-
-
- public RemoveConnectionActionProvider() {
- super(new DeleteConnectionAction(), "group.edition");
- }
-
-
- public static class DeleteConnectionAction extends AbstractAction {
-
- public DeleteConnectionAction() {
- super("Disconnect");
- }
-
- @Override
- public void run() {
- final ITreeSelection treeSelection = (ITreeSelection)selection;
- if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) {
- final IUser user = (IUser) treeSelection.getFirstElement();
- UserModel.getDefault().removeUser(user);
- }
- }
-
-
- }
-
-}
12 years, 4 months
JBoss Tools SVN: r38978 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: launchers and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-22 08:31:24 -0500 (Wed, 22 Feb 2012)
New Revision: 38978
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/launchers/WSAllBotTestsMaven.launch
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/AnnotationPropertiesTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/views/AnnotationProperties.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/todo.txt
Log:
Some fixes and modification f.e. default runtime type is not set to particular type
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/launchers/WSAllBotTestsMaven.launch
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/launchers/WSAllBotTestsMaven.launch 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/launchers/WSAllBotTestsMaven.launch 2012-02-22 13:31:24 UTC (rev 38978)
@@ -4,7 +4,7 @@
<stringAttribute key="M2_GOALS" value="clean install"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
+<stringAttribute key="M2_PROFILES" value="-P default"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="swtbot.test.skip=false"/>
<listEntry value="swtbot.properties=/home/jjankovi/swtbot.properties"/>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-02-22 13:31:24 UTC (rev 38978)
@@ -13,6 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
+ <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
<systemProperties>-Dswtbot.test.properties.file=${swtbot.properties}</systemProperties>
</properties>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-02-22 13:31:24 UTC (rev 38978)
@@ -11,6 +11,7 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ws.ui.bot.test.annotation.AnnotationPropertiesTest;
import org.jboss.tools.ws.ui.bot.test.rest.completion.RESTfulCompletionTest;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulSupportTest;
@@ -53,7 +54,7 @@
SampleRESTWebServiceTest.class,
SimpleSoapWebServiceTest.class,
SimpleRESTWebServiceTest.class,
-// AnnotationPropertiesTest.class,
+ AnnotationPropertiesTest.class,
RESTfulSupportTest.class,
RESTfulExplorerTest.class,
RESTfulValidationTest.class,
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-02-22 13:31:24 UTC (rev 38978)
@@ -18,7 +18,6 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
import org.jboss.tools.ws.ui.bot.test.utils.DeploymentHelper;
import org.jboss.tools.ws.ui.bot.test.utils.ProjectHelper;
@@ -34,7 +33,8 @@
* @author jjankovi
*
*/
-@Require(server=(a)Server(type=ServerType.EAP), perspective="Java EE")
+//@Require(server=(a)Server(type=ServerType.EAP), perspective="Java EE")
+@Require(server=@Server(), perspective="Java EE")
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/AnnotationPropertiesTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/AnnotationPropertiesTest.java 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/AnnotationPropertiesTest.java 2012-02-22 13:31:24 UTC (rev 38978)
@@ -11,7 +11,10 @@
package org.jboss.tools.ws.ui.bot.test.annotation;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
+import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
+import org.jboss.tools.ws.ui.bot.test.uiutils.views.AnnotationProperties;
import org.junit.Test;
/**
@@ -44,6 +47,17 @@
@Test
public void testAbsenceOfAnnotation() {
+ /*
+ resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
+ RESTfulExplorerTest.class.
+ getResourceAsStream(BASIC_WS_RESOURCE),
+ false, getWsPackage(), getWsName());
+
+ SWTJBTExt.selectTextInSourcePane(bot, getWsName() + ".java", getWsName(), 0, 0);
+
+ AnnotationProperties annotProperties = new AnnotationProperties();
+ */
+
}
/**
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/views/AnnotationProperties.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/views/AnnotationProperties.java 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/views/AnnotationProperties.java 2012-02-22 13:31:24 UTC (rev 38978)
@@ -14,10 +14,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.jws.WebService;
-
-
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -26,64 +22,76 @@
/**
*
* @author jjankovi
- *
+ *
*/
-@WebService(targetNamespace = "http://views.uiutils.test.bot.ui.ws.tools.jboss.org/", portName = "AnnotationPropertiesPort", serviceName = "AnnotationPropertiesService")
public class AnnotationProperties extends ViewBase {
public AnnotationProperties() {
viewObject = ActionItem.View.JAXWSAnnotationProperties.LABEL;
}
-
+
public List<SWTBotTreeItem> getAllAnnotations() {
-
+
List<SWTBotTreeItem> annotations = new ArrayList<SWTBotTreeItem>();
SWTBotTree annotationViewTree = null;
- try {
- annotationViewTree = show().bot().tree();
- for (SWTBotTreeItem ti : annotationViewTree.getAllItems()) {
- annotations.add(ti);
- }
- } catch (WidgetNotFoundException exc) {
- log.warn("There are no web service annotations in Annotation Properties view");
+
+ annotationViewTree = show().bot().tree();
+ for (SWTBotTreeItem ti : annotationViewTree.getAllItems()) {
+ annotations.add(ti);
}
-
+
return annotations;
}
-
+
public List<SWTBotTreeItem> getAnnotationValues(SWTBotTreeItem annotation) {
-
+
List<SWTBotTreeItem> annotValues = new ArrayList<SWTBotTreeItem>();
for (SWTBotTreeItem ti : annotValues) {
annotValues.add(ti);
}
return annotValues;
-
+
}
-
+
+ //!!!not working
public boolean isAnnotationPresence(SWTBotTreeItem annotation) {
return annotation.isChecked();
}
-
+
+ //!!!not working
+ public List<SWTBotTreeItem> getAllActiveAnnotation() {
+
+ List<SWTBotTreeItem> activeAnnotations = new ArrayList<SWTBotTreeItem>();
+ for (SWTBotTreeItem ti : getAllAnnotations()) {
+ if (isAnnotationPresence(ti)) {
+ activeAnnotations.add(ti);
+ }
+ }
+ return activeAnnotations;
+
+ }
+
+ //!!!not working
public SWTBotTreeItem activateAnnotation(SWTBotTreeItem annotation) {
annotation.check();
return annotation;
}
-
+
+ //!!!not working
public SWTBotTreeItem deactivateAnnotation(SWTBotTreeItem annotation) {
annotation.uncheck();
return annotation;
}
-
- public SWTBotTreeItem changeAnnotationParamValue(SWTBotTreeItem annotation, String param,
- String newValue) {
+
+ public SWTBotTreeItem changeAnnotationParamValue(SWTBotTreeItem annotation,
+ String param, String newValue) {
for (SWTBotTreeItem parameter : getAnnotationValues(annotation)) {
if (parameter.equals(param)) {
- //change value of parameter no newValue
+ // change value of parameter no newValue
break;
}
}
return annotation;
}
-
+
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/todo.txt
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/todo.txt 2012-02-22 13:30:10 UTC (rev 38977)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/todo.txt 2012-02-22 13:31:24 UTC (rev 38978)
@@ -1,3 +1,4 @@
+* Find a way to get to checkbox in Tree/Table which is not in first column
* Fix AnnotationProperties to be able to change Annotation parameter value
* Complete AnnotationPropertiesTest
* Complete multiple tests run (against AS 7 and EAP 5.1)
12 years, 4 months
JBoss Tools SVN: r38977 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-22 08:30:10 -0500 (Wed, 22 Feb 2012)
New Revision: 38977
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
Log:
Small fix for RESTfulTestBase
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-22 13:27:34 UTC (rev 38976)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-22 13:30:10 UTC (rev 38977)
@@ -64,16 +64,17 @@
@Override
public void setup() {
if (!projectExists(getWsProjectName())) {
- projectHelper.createProject(getWsProjectName());
- }
- if (!isRestSupportEnabled(getWsProjectName())) {
- // workaround for EAP 5.1
- if (configuredState.getServer().type.equals("EAP") &&
- configuredState.getServer().version.equals("5.1")) {
- addRestEasyLibs(getWsProjectName());
+ projectHelper.createProject(getWsProjectName());
+ if (!isRestSupportEnabled(getWsProjectName())) {
+ // workaround for EAP 5.1
+ if (configuredState.getServer().type.equals("EAP") &&
+ configuredState.getServer().version.equals("5.1")) {
+ addRestEasyLibs(getWsProjectName());
+ }
+ addRestSupport(getWsProjectName());
}
- addRestSupport(getWsProjectName());
}
+
if (!projectExplorer.isFilePresent(getWsProjectName(), "Java Resources",
"src", getWsPackage(), getWsName() + ".java")) {
projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName());
12 years, 4 months
JBoss Tools SVN: r38976 - in branches/jbosstools-3.3.0.Beta1/ws/plugins: org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-22 08:27:34 -0500 (Wed, 22 Feb 2012)
New Revision: 38976
Modified:
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElement.java
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElementAdapterFactory.java
Log:
Fixed - JBIDE-10250 - Restore error decorators on the JAX-RS endpoints icons when validation detects errors
https://issues.jboss.org/browse/JBIDE-10250
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-02-22 13:24:32 UTC (rev 38975)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-02-22 13:27:34 UTC (rev 38976)
@@ -195,11 +195,15 @@
@Override
public List<ValidatorMessage> validate() throws JavaModelException {
+ this.hasErrors(false);
final List<ValidatorMessage> messages = new ArrayList<ValidatorMessage>();
messages.addAll(validateMissingPathValueInPathParamAnnotations());
messages.addAll(validateMissingPathParamAnnotations());
messages.addAll(validateParamsWithContextAnnotation());
messages.addAll(validateSingleParamWithoutAnnotation());
+ if(messages.size() > 0) {
+ this.hasErrors(true);
+ }
return messages;
}
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2012-02-22 13:24:32 UTC (rev 38975)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2012-02-22 13:27:34 UTC (rev 38976)
@@ -102,7 +102,6 @@
monitor.beginTask("Loading JAX-RS metamodel for project '" + project.getName() + "'...",
IProgressMonitor.UNKNOWN);
monitor.worked(1);
-
refreshViewerObject(uriPathTemplateCategory);
monitor.done();
return Status.OK_STATUS;
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java 2012-02-22 13:24:32 UTC (rev 38975)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateCategory.java 2012-02-22 13:27:34 UTC (rev 38976)
@@ -33,7 +33,8 @@
private final Map<IJaxrsEndpoint, UriPathTemplateElement> wrapperCache = new HashMap<IJaxrsEndpoint, UriPathTemplateElement>();
- public UriPathTemplateCategory(UriMappingsContentProvider parent, IProject project) {
+ public UriPathTemplateCategory(UriMappingsContentProvider parent,
+ IProject project) {
super();
this.parent = parent;
this.project = project;
@@ -43,10 +44,12 @@
@Override
public Object[] getChildren(Object parentElement) {
try {
- final IJaxrsMetamodel metamodel = JaxrsMetamodelLocator.get(project);
+ final IJaxrsMetamodel metamodel = JaxrsMetamodelLocator
+ .get(project);
if (metamodel != null) {
List<IJaxrsEndpoint> endpoints = metamodel.getAllEndpoints();
- Logger.debug("UriPathTemplateCatrogory contains {} endpoints", endpoints.size());
+ Logger.debug("UriPathTemplateCatrogory contains {} endpoints",
+ endpoints.size());
List<UriPathTemplateElement> uriPathTemplateElements = new ArrayList<UriPathTemplateElement>();
// Collections.sort(uriMappings);
for (IJaxrsEndpoint endpoint : endpoints) {
@@ -54,9 +57,16 @@
// LinkedList<IJaxrsResourceMethod> resourceMethods =
// endpoint.getResourceMethods();
if (element == null) {
- Logger.trace("Creating element for endpoint {} ('cause not found in wrapperCache)", endpoint);
+ Logger.trace(
+ "Creating element for endpoint {} ('cause not found in wrapperCache)",
+ endpoint);
element = new UriPathTemplateElement(endpoint, this);
wrapperCache.put(endpoint, element);
+ }
+ // after a clean build, the 'endpoint' reference should be updated
+ else if (element.getEndpoint() != endpoint) {
+ element.setEndpoint(endpoint);
+
}
Logger.trace("Adding element for endpoint {}", endpoint);
uriPathTemplateElements.add(element);
@@ -64,7 +74,8 @@
return uriPathTemplateElements.toArray();
}
} catch (CoreException e) {
- Logger.error("Failed to retrieve JAX-RS Metamodel in project '" + project.getName() + "'", e);
+ Logger.error("Failed to retrieve JAX-RS Metamodel in project '"
+ + project.getName() + "'", e);
}
return new Object[0];
}
@@ -84,12 +95,14 @@
@Override
public boolean hasChildren(Object element) {
try {
- final IJaxrsMetamodel metamodel = JaxrsMetamodelLocator.get(project);
+ final IJaxrsMetamodel metamodel = JaxrsMetamodelLocator
+ .get(project);
if (metamodel != null) {
return (metamodel.getAllEndpoints().size() > 0);
}
} catch (CoreException e) {
- Logger.error("Failed to retrieve JAX-RS Metamodel in project '" + project.getName() + "'", e);
+ Logger.error("Failed to retrieve JAX-RS Metamodel in project '"
+ + project.getName() + "'", e);
}
return false;
}
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElement.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElement.java 2012-02-22 13:24:32 UTC (rev 38975)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElement.java 2012-02-22 13:27:34 UTC (rev 38976)
@@ -24,7 +24,7 @@
public class UriPathTemplateElement implements ITreeContentProvider, ILaunchable {
- private final IJaxrsEndpoint endpoint;
+ private IJaxrsEndpoint endpoint;
private final UriPathTemplateCategory uriPathTemplateCategory;
@@ -79,6 +79,10 @@
return false;
}
+ public void setEndpoint(IJaxrsEndpoint endpoint) {
+ this.endpoint = endpoint;
+ }
+
/** @return the uriMapping */
public IJaxrsEndpoint getEndpoint() {
return endpoint;
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElementAdapterFactory.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElementAdapterFactory.java 2012-02-22 13:24:32 UTC (rev 38975)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriPathTemplateElementAdapterFactory.java 2012-02-22 13:27:34 UTC (rev 38976)
@@ -1,3 +1,4 @@
+
package org.jboss.tools.ws.jaxrs.ui.cnf;
import org.eclipse.core.runtime.IAdapterFactory;
12 years, 4 months
JBoss Tools SVN: r38975 - in branches/jbosstools-3.3.0.Beta1/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-22 08:24:32 -0500 (Wed, 22 Feb 2012)
New Revision: 38975
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-10484] now reporting error details to the user
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-02-22 12:41:50 UTC (rev 38974)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-02-22 13:24:32 UTC (rev 38975)
@@ -15,10 +15,12 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftEndpointException;
/**
* @author Andre Dietisheim
@@ -47,8 +49,12 @@
try {
model.renameDomain();
return Status.OK_STATUS;
+ } catch(OpenShiftEndpointException e) {
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e);
} catch (Exception e) {
- return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not rename domain", e);
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not rename domain {0}", model.getNamespace()), e);
}
}
}, getContainer());
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-02-22 12:41:50 UTC (rev 38974)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-02-22 13:24:32 UTC (rev 38975)
@@ -20,6 +20,7 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftEndpointException;
/**
* @author André Dietisheim
@@ -41,9 +42,12 @@
protected IStatus run(IProgressMonitor monitor) {
try {
model.createDomain();
+ } catch (OpenShiftEndpointException e) {
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e);
} catch (Exception e) {
- return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind("Could not create domain \"{0}\"", model.getNamespace()), e);
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not create domain \"{0}\"", model.getNamespace()), e);
}
return Status.OK_STATUS;
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 12:41:50 UTC (rev 38974)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 13:24:32 UTC (rev 38975)
@@ -45,6 +45,7 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftEndpointException;
import com.openshift.express.client.OpenShiftException;
/**
@@ -193,8 +194,12 @@
try {
getWizardModel().createApplication(monitor);
return Status.OK_STATUS;
- } catch (Exception e) {
+ } catch (OpenShiftEndpointException e) {
// TODO: refresh user
+ return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\": {1}",
+ e, applicationName, e.getResponseResult());
+ } catch (OpenShiftException e) {
+ // TODO: refresh user
return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\"",
e, applicationName);
}
@@ -210,9 +215,9 @@
private boolean addRemoveCartridges(final IApplication application,
final Set<IEmbeddableCartridge> selectedCartridges) {
try {
+ final String applicationName = getWizardModel().getApplication().getName();
IStatus status = WizardUtils.runInWizard(
- new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", getWizardModel()
- .getApplication().getName())) {
+ new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", applicationName)) {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -222,6 +227,10 @@
embeddableCartridges.addAll(selectedCartridges);
application.addEmbbedCartridges(embeddableCartridges);
}
+ } catch (OpenShiftEndpointException e) {
+ // TODO: refresh user
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not embed cartridges to application {0}: {1}", applicationName, e.getResponseResult()));
} catch (OpenShiftException e) {
return OpenShiftUIActivator.createErrorStatus(NLS.bind(
"Could not embed cartridges to application {0}", getWizardModel()
12 years, 4 months
JBoss Tools SVN: r38974 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-02-22 07:41:50 -0500 (Wed, 22 Feb 2012)
New Revision: 38974
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Fixes for maven integration
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-02-22 11:29:26 UTC (rev 38973)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-02-22 12:41:50 UTC (rev 38974)
@@ -14,6 +14,7 @@
import java.util.LinkedList;
import java.util.List;
+import org.eclipse.swt.SWTException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
import org.jboss.tools.ui.bot.ext.Assertions;
@@ -273,22 +274,6 @@
expectedProposals.add("msgs");
expectedProposals.add("user : User");
expectedProposals.add("\"#{user.name}\"");
- expectedProposals.add("applicationScope");
- expectedProposals.add("cc");
- expectedProposals.add("component");
- expectedProposals.add("cookie");
- expectedProposals.add("facesContext");
- expectedProposals.add("flash");
- expectedProposals.add("header");
- expectedProposals.add("headerValues");
- expectedProposals.add("initParam");
- expectedProposals.add("param");
- expectedProposals.add("paramValues");
- expectedProposals.add("requestScope");
- expectedProposals.add("resource");
- expectedProposals.add("sessionScope");
- expectedProposals.add("view");
- expectedProposals.add("viewScope");
// Check content assist for #{ prefix
ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
JSF2_TEST_PAGE,
@@ -391,6 +376,7 @@
openPage(FACELETS_TEST_PAGE,FACELETS_TEST_PROJECT_NAME);
editor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE);
originalEditorText = editor.getText();
+ setProjectName(FACELETS_TEST_PROJECT_NAME);
}
/**
@@ -402,6 +388,7 @@
openPage(JSF2_TEST_PAGE, JSF2_TEST_PROJECT_NAME);
compositeComponentContainerEditor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE);
origCompositeComponentContainerEditorText = compositeComponentContainerEditor.getText();
+ setProjectName(JSF2_TEST_PROJECT_NAME);
}
/**
* Returns list of expected Content Assist proposals for Input tag
@@ -528,15 +515,21 @@
public void tearDown() throws Exception {
if (editor != null){
editor.setText(originalEditorText);
- editor.saveAndClose();
+ editor.save();
+ util.waitForNonIgnoredJobs();
+ editor.close();
}
if (compositeComponentDefEditor != null){
compositeComponentDefEditor.setText(compositeComponentDefEditorText);
- compositeComponentDefEditor.saveAndClose();
+ compositeComponentDefEditor.save();
+ util.waitForNonIgnoredJobs();
+ compositeComponentDefEditor.close();
}
if (compositeComponentContainerEditor != null){
compositeComponentContainerEditor.setText(origCompositeComponentContainerEditorText);
- compositeComponentContainerEditor.saveAndClose();
+ compositeComponentContainerEditor.save();
+ util.waitForNonIgnoredJobs();
+ compositeComponentContainerEditor.close();
}
util.waitForNonIgnoredJobs();
removeRichFacesFromJSF2ProjectClassPath();
@@ -660,8 +653,14 @@
* Add RichFaces library to JSF2 project classpath
*/
private void addRichFacesToJSF2ProjectClassPath(){
+ Throwable exceptionBeforeCall = getException();
addedVariableRichfacesUiLocation = BuildPathHelper.addExternalJar(VPEAutoTestCase.RICH_FACES_UI_JAR_LOCATION,
JSF2_TEST_PROJECT_NAME);
+ if (exceptionBeforeCall == null
+ && getException() != null
+ && getException() instanceof SWTException){
+ setException(null);
+ }
}
/**
* Remove previously added RichFaces library from JSF2 project classpath
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-02-22 11:29:26 UTC (rev 38973)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-02-22 12:41:50 UTC (rev 38974)
@@ -1606,8 +1606,10 @@
Assert.assertTrue(isProjectInPackageExplorer(projectName));
bot.sleep(Timing.time2S());
util.waitForNonIgnoredJobs();
- ContextMenuHelper.clickContextMenu(packageExplorer.bot().tree(),
- IDELabel.Menu.PROPERTIES);
+ MenuBarHelper
+ .getMenu(IDELabel.Menu.PROJECT)
+ .menu(IDELabel.Menu.PROPERTIES)
+ .click();
waitForShell(IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
return bot;
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-02-22 11:29:26 UTC (rev 38973)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-02-22 12:41:50 UTC (rev 38974)
@@ -82,6 +82,8 @@
protected final static String JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE;
protected final static String RICH_FACES_UI_JAR_LOCATION;
+ private String projectName = null;
+
static {
try {
InputStream inputStream = VPEAutoTestCase.class
@@ -131,6 +133,9 @@
RICH_FACES_UI_JAR_LOCATION = richFacesUiLocation;
}
+ protected void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
/**
* @see #clearWorkbench()
* @see #createJSFProject(String)
@@ -159,7 +164,9 @@
@After
public void tearDown() throws Exception {
clearWorkbench();
- new SWTJBTExt(bot).removeProjectFromServers(JBT_TEST_PROJECT_NAME);
+ new SWTJBTExt(bot)
+ .removeProjectFromServers((projectName != null && projectName.length() > 0) ? projectName : JBT_TEST_PROJECT_NAME);
+ setProjectName(null);
super.tearDown();
}
12 years, 4 months
JBoss Tools SVN: r38973 - in trunk/as: plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-22 06:29:26 -0500 (Wed, 22 Feb 2012)
New Revision: 38973
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
Log:
JBIDE-10986 - not enough RSE bundles when installing jbt from update site. COmmit to trunk
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 11:26:58 UTC (rev 38972)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 11:29:26 UTC (rev 38973)
@@ -46,10 +46,27 @@
<import plugin="org.jboss.ide.eclipse.as.ui" />
<import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" />
- <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" />
+
+ <!--
+ The following plugins are required for completeness and usability of product only.
+ We have no compilation requirements against them, nor any critical outstanding bugs
+ that require a specific version or API.
+ -->
+ <import plugin="org.eclipse.rse.connectorservice.local"/>
+ <import plugin="org.eclipse.rse.connectorservice.ssh"/>
+ <import plugin="org.eclipse.rse.processes.ui"/>
+ <import plugin="org.eclipse.rse.shells.ui"/>
+ <import plugin="org.eclipse.rse.subsystems.files.local"/>
+ <import plugin="org.eclipse.rse.subsystems.files.ssh"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.core"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.local"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/>
+ <import plugin="org.eclipse.rse.subsystems.terminals.core"/>
+ <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/>
+ <import plugin="org.eclipse.rse.terminals.ui"/>
</requires>
<plugin id="org.jboss.ide.eclipse.as.rse.core" download-size="0" install-size="0" version="0.0.0" unpack="false" />
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2012-02-22 11:26:58 UTC (rev 38972)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2012-02-22 11:29:26 UTC (rev 38973)
@@ -28,7 +28,6 @@
org.eclipse.rse.ui;bundle-version="3.2.0",
org.eclipse.wst.server.ui;bundle-version="1.1.305",
org.eclipse.debug.ui;bundle-version="3.7.0",
- org.eclipse.rse.subsystems.shells.dstore;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.200",
12 years, 4 months
JBoss Tools SVN: r38972 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-22 06:26:58 -0500 (Wed, 22 Feb 2012)
New Revision: 38972
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
Log:
JBIDE-10994 - UI freeze, show error
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-22 11:26:17 UTC (rev 38971)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-22 11:26:58 UTC (rev 38972)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.viewer;
import java.util.ArrayList;
+import java.util.HashMap;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -55,12 +56,14 @@
// Keep track of what's loading and what's finished
private ArrayList<IUser> loadedUsers = new ArrayList<IUser>();
private ArrayList<IUser> loadingUsers = new ArrayList<IUser>();
+ private HashMap<IUser, OpenShiftException> errors = new HashMap<IUser, OpenShiftException>();
@Override
public Object[] getElements(final Object parentElement) {
// A refresh on the whole model... clear our cache
loadedUsers.clear();
loadingUsers.clear();
+ errors.clear();
if (parentElement instanceof IWorkspaceRoot) {
return UserModel.getDefault().getUsers();
}
@@ -82,22 +85,35 @@
// return a stub object that says loading...
return new Object[] { new LoadingStub() };
}
+ OpenShiftException ose = errors.get((IUser)parentElement);
+ if( ose != null ) {
+ return new Object[]{ose};
+ }
}
- return getChildrenFor(parentElement, false);
+ return getChildrenForElement_LogException(parentElement, false);
}
// Force the children to load completely
private void getChildrenFor(Object[] parentElements) {
for (int i = 0; i < parentElements.length; i++) {
- getChildrenFor(parentElements[i], true);
+ getChildrenForElement_LogException(parentElements[i], true);
}
}
// Get the children without the protection of a "loading..." situation
- private Object[] getChildrenFor(Object parentElement, boolean recurse) {
+ private Object[] getChildrenForElement_LogException(Object parentElement, boolean recurse) {
+ try {
+ return getChildrenForElement(parentElement, recurse);
+ } catch (OpenShiftException e) {
+ Logger.error("Unable to retrieve OpenShift Express information", e);
+ }
+ return new Object[0];
+ }
+
+ private Object[] getChildrenForElement(Object parentElement, boolean recurse) throws OpenShiftException {
// .... the actual work is done here...
Object[] children = new Object[0];
- try {
+// try {
if (parentElement instanceof OpenShiftExpressConsoleContentCategory) {
IUser user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
children = new Object[] { user };
@@ -115,9 +131,9 @@
if (recurse) {
getChildrenFor(children);
}
- } catch (OpenShiftException e) {
- Logger.error("Unable to retrieve OpenShift Express information", e);
- }
+// } catch (OpenShiftException e) {
+// Logger.error("Unable to retrieve OpenShift Express information", e);
+// }
return children;
}
@@ -130,10 +146,14 @@
monitor.worked(1);
// Get the actual children, with the delay
loadingUsers.add(user);
- getChildrenFor(user, true);
+ try {
+ getChildrenForElement(user, true);
+ } catch(OpenShiftException e) {
+ errors.put(user, e);
+ }
loadedUsers.add(user);
loadingUsers.remove(user);
- refreshViewerObject(user);
+ refreshViewerObject(user);
monitor.done();
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-22 11:26:17 UTC (rev 38971)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-22 11:26:58 UTC (rev 38972)
@@ -15,12 +15,15 @@
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftException;
/**
* @author Xavier Coulon
@@ -65,7 +68,9 @@
if (element instanceof LoadingStub) {
return OpenShiftUIActivator.getDefault().createImage("systemprocess.gif");
}
-
+ if (element instanceof OpenShiftException ) {
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ }
return null;
}
@@ -104,6 +109,9 @@
if (element instanceof LoadingStub) {
return new StyledString("Loading...");
}
+ if (element instanceof OpenShiftException ) {
+ return new StyledString( ((OpenShiftException)element).getMessage());
+ }
return null;
}
12 years, 4 months
JBoss Tools SVN: r38971 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-22 06:26:17 -0500 (Wed, 22 Feb 2012)
New Revision: 38971
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
Log:
[JBIDE-10994] built a new client jar that handles timeouts correctly
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 4 months
JBoss Tools SVN: r38970 - in trunk/documentation/whatsnew/hibernate: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-02-22 04:56:34 -0500 (Wed, 22 Feb 2012)
New Revision: 38970
Added:
trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.Beta1.html
trunk/documentation/whatsnew/hibernate/images/console_configuration_hibernate_version2.png
Log:
Hibernate component new and noteworthy
Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.Beta1.html 2012-02-22 09:56:34 UTC (rev 38970)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Hibernate tools 3.5.0.Beta1 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Hibernate tools 3.5.0.Beta1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main
+ Index</a> <a
+href="../examples/examples-news-3.3.0.Beta1.html">Project Examples ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Hibernate Multiversion support</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Select Hibernate Version</b></td>
+ <td valign="top">
+ <p>Support of Hibernate 3.6 added in addition to Hibernate 3.5 and 4.0. </p>
+
+ <p>Be aware that Hibernate 3.6 and 4.0 support is still experimental and not *all*
+ operations/features are enabled yet, but we
+ include it so you can give feedback/report issues for this to
+ make the support more complete.</p>
+ <img src="images/console_configuration_hibernate_version2.png"/>
+
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10646">Related jira</a></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/hibernate/images/console_configuration_hibernate_version2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/console_configuration_hibernate_version2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 4 months