JBoss Tools SVN: r26406 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: dpospisi(a)redhat.com
Date: 2010-11-10 06:46:09 -0500 (Wed, 10 Nov 2010)
New Revision: 26406
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
Log:
Fixed SWTBotExt.browserExt().
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-10 11:18:19 UTC (rev 26405)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-10 11:46:09 UTC (rev 26406)
@@ -105,7 +105,7 @@
@SuppressWarnings("unchecked")
public SWTBotBrowserExt browserExt() {
try {
- List<Browser> bsrs = (List<Browser>) widgetOfType(Browser.class);
+ List<Browser> bsrs = (List<Browser>) widgets(widgetOfType(Browser.class));
return new SWTBotBrowserExt(bsrs.get(0));
} catch (WidgetNotFoundException ex) {
throw new WidgetNotFoundException(
15 years, 5 months
JBoss Tools SVN: r26405 - in trunk: jsf/tests/org.jboss.tools.jsf.test/META-INF and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-10 06:18:19 -0500 (Wed, 10 Nov 2010)
New Revision: 26405
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-7545 Added org.eclipse.jst.standard.schemas plug-in as required plug-in to increase performance of XML validation in test projects.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -17,6 +17,7 @@
org.jboss.tools.common.model.ui,
org.eclipse.ltk.core.refactoring,
org.jboss.tools.jst.web.kb,
- org.jboss.tools.cdi.xml
+ org.jboss.tools.cdi.xml,
+ org.eclipse.jst.standard.schemas
Export-Package: org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.core.test.tck
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -32,7 +32,8 @@
org.eclipse.wst.validation,
org.jboss.tools.common.el.core,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.model.test
+ org.jboss.tools.common.model.test,
+ org.eclipse.jst.standard.schemas
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -22,7 +22,8 @@
org.jboss.tools.jst.text.ext;bundle-version="3.1.0",
org.jboss.tools.jsf.text.ext.facelets;bundle-version="3.1.0",
org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.ui;bundle-version="3.1.0"
+ org.jboss.tools.jsf.ui;bundle-version="3.1.0",
+ org.eclipse.jst.standard.schemas
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jsf.text.ext.test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -27,6 +27,7 @@
org.jboss.tools.common.el.core,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.kb,
- org.jboss.tools.jsf
+ org.jboss.tools.jsf,
+ org.eclipse.jst.standard.schemas
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -17,6 +17,7 @@
org.jboss.tools.jst.web.verification,
org.jboss.tools.common.model.ui,
org.jboss.tools.common.test,
- org.jboss.tools.common.verification.test
+ org.jboss.tools.common.verification.test,
+ org.eclipse.jst.standard.schemas
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -16,7 +16,8 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.web,
org.jboss.tools.common.text.xml,
- org.jboss.tools.jst.web.kb
+ org.jboss.tools.jst.web.kb,
+ org.eclipse.jst.standard.schemas
Export-Package:
org.jboss.tools.jst.jsp.test,
org.jboss.tools.jst.jsp.test.ca
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -14,7 +14,8 @@
org.jboss.tools.jst.web,
org.eclipse.jface.text,
org.jboss.tools.common.model.ui,
- org.jboss.tools.jst.text.ext;bundle-version="3.1.0"
+ org.jboss.tools.jst.text.ext,
+ org.eclipse.jst.standard.schemas
Export-Package: org.jboss.tools.jst.text.ext.test
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -11,7 +11,8 @@
org.jboss.tools.tests,
org.jboss.tools.common.el.core,
org.jboss.tools.common.model.test,
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.eclipse.jst.standard.schemas
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -5,7 +5,8 @@
Bundle-Version: 3.2.0.qualifier
Require-Bundle: org.jboss.tools.jst.web,
org.junit,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.eclipse.jst.standard.schemas
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -11,7 +11,8 @@
org.jboss.tools.common.model.ui.test,
org.jboss.tools.tests,
org.eclipse.ui.ide,
- org.eclipse.wst.server.core
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.standard.schemas
Export-Package: org.jboss.tools.jst.web.ui.test
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -35,6 +35,7 @@
org.jboss.tools.jst.jsp;bundle-version="3.1.0",
org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0",
org.jboss.tools.seam.pages.xml,
- org.jboss.tools.seam.xml
+ org.jboss.tools.seam.xml,
+ org.eclipse.jst.standard.schemas
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -36,7 +36,8 @@
org.eclipse.jst.jsf.ui;bundle-version="1.3.0",
org.eclipse.jst.common.project.facet.core;bundle-version="1.4.100",
org.eclipse.jst.jsf.core;bundle-version="1.3.0",
- org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0"
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0",
+ org.eclipse.jst.standard.schemas
Export-Package: org.jboss.tools.seam.ui.test,
org.jboss.tools.seam.ui.test.ca,
org.jboss.tools.seam.ui.test.hyperlink,
Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-11-10 10:44:19 UTC (rev 26404)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-11-10 11:18:19 UTC (rev 26405)
@@ -7,6 +7,7 @@
org.junit,
org.jboss.tools.seam.xml,
org.jboss.tools.common.test,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.eclipse.jst.standard.schemas
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
15 years, 5 months
JBoss Tools SVN: r26404 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-11-10 05:44:19 -0500 (Wed, 10 Nov 2010)
New Revision: 26404
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowOptionAbstractHandler.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java
Log:
https://jira.jboss.org/browse/JBIDE-7531
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath 2010-11-10 10:35:55 UTC (rev 26403)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath 2010-11-10 10:44:19 UTC (rev 26404)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/jhighlight-1.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/jhighlight-1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-10 10:35:55 UTC (rev 26403)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-10 10:44:19 UTC (rev 26404)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Copyright (c) 2007-2010 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -11,85 +11,24 @@
package org.jboss.tools.vpe.handlers;
-import java.util.Map;
-
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.menus.UIElement;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.editor.VpeController;
/**
* Handler for ShowBorder
*/
-public class ShowBorderHandler extends VisualPartAbstractHandler {
+public class ShowBorderHandler extends ShowOptionAbstractHandler {
public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showBorderCommand"; //$NON-NLS-1$
- /**
- * the command has been executed, so extract extract the needed information
- * from the application context.
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
-
- boolean oldToggleState = HandlerUtil.toggleCommandState(event
- .getCommand());
- JspEditorPlugin
- .getDefault()
- .getPreferenceStore()
- .setValue(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS,
- !oldToggleState);
-
- Command command = event.getCommand();
- ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
- commandService.refreshElements(command.getId(), null);
-
- return null;
+ @Override
+ public String getPreferenceKey() {
+ return IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS;
}
- public void updateElement(UIElement element, Map parameters) {
- super.updateElement(element, parameters);
- boolean toggleState = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS);
-
- IEditorReference[] openedEditors = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage()
- .getEditorReferences();
- for (IEditorReference openedEditor : openedEditors) {
- IEditorPart editor = openedEditor.getEditor(true);
- toggleShowBorder(editor, toggleState);
- }
- }
-
- private void toggleShowBorder(IEditorPart editor, boolean toggleState) {
-
- if (!(editor instanceof JSPMultiPageEditor)) {
- return;
- }
-
- JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
- VpeController vpeController = (VpeController) jspEditor
- .getVisualEditor().getController();
- if (vpeController == null) {
- return;
- }
-
- /*
- * Set new value to VpeVisualDomBuilder.
- */
+ @Override
+ protected void toogleShow(VpeController vpeController, boolean state) {
vpeController.getVisualBuilder().setShowBorderForUnknownTags(
- toggleState);
- /*
- * Update VPE
- */
- vpeController.visualRefresh();
+ state);
+
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-10 10:35:55 UTC (rev 26403)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-10 10:44:19 UTC (rev 26404)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Copyright (c) 2007-2010 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -11,86 +11,24 @@
package org.jboss.tools.vpe.handlers;
-import java.util.Map;
-
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.menus.UIElement;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.editor.VpeController;
/**
* Handler for ShowBundleAsEL
*/
-public class ShowBundleAsELHandler extends VisualPartAbstractHandler {
+public class ShowBundleAsELHandler extends ShowOptionAbstractHandler {
public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showBundleAsELCommand"; //$NON-NLS-1$
- /**
- * the command has been executed, so extract extract the needed information
- * from the application context.
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
-
- boolean oldToggleState = HandlerUtil.toggleCommandState(event
- .getCommand());
- JspEditorPlugin
- .getDefault()
- .getPreferenceStore()
- .setValue(
- IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL,
- !oldToggleState);
-
- Command command = event.getCommand();
- ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
- commandService.refreshElements(command.getId(), null);
-
- return null;
+ @Override
+ public String getPreferenceKey() {
+ return IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL;
}
- public void updateElement(UIElement element, Map parameters) {
- super.updateElement(element, parameters);
- boolean toggleState = JspEditorPlugin
- .getDefault()
- .getPreferenceStore()
- .getBoolean(
- IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL);
-
- IEditorReference[] openedEditors = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage()
- .getEditorReferences();
- for (IEditorReference openedEditor : openedEditors) {
- IEditorPart editor = openedEditor.getEditor(true);
- toggleShowBundleAsEl(editor, toggleState);
- }
- }
-
- private void toggleShowBundleAsEl(IEditorPart editor, boolean toggleState) {
-
- if (!(editor instanceof JSPMultiPageEditor)) {
- return;
- }
-
- JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
- VpeController vpeController = (VpeController) jspEditor
- .getVisualEditor().getController();
- if (vpeController == null) {
- return;
- }
-
- /*
- * Update bundle messages.
- */
+ @Override
+ protected void toogleShow(VpeController vpeController,
+ boolean state) {
vpeController.getPageContext().getBundle()
- .updateShowBundleUsageAsEL(toggleState);
- vpeController.visualRefresh();
+ .updateShowBundleUsageAsEL(state);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-10 10:35:55 UTC (rev 26403)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-10 10:44:19 UTC (rev 26404)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Copyright (c) 2007-2010 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -11,85 +11,23 @@
package org.jboss.tools.vpe.handlers;
-import java.util.Map;
-
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.menus.UIElement;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.editor.VpeController;
/**
* Handler for ShowNonVisualTags
*/
-public class ShowNonVisualTagsHandler extends VisualPartAbstractHandler {
+public class ShowNonVisualTagsHandler extends ShowOptionAbstractHandler {
public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showNonVisualTagsCommand"; //$NON-NLS-1$
- /**
- * the command has been executed, so extract extract the needed information
- * from the application context.
- */
- public Object execute(ExecutionEvent event) throws ExecutionException {
-
- boolean oldToggleState = HandlerUtil.toggleCommandState(event
- .getCommand());
- JspEditorPlugin
- .getDefault()
- .getPreferenceStore()
- .setValue(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS,
- !oldToggleState);
-
- Command command = event.getCommand();
- ICommandService commandService = (ICommandService) PlatformUI
- .getWorkbench().getService(ICommandService.class);
- commandService.refreshElements(command.getId(), null);
-
- return null;
+ @Override
+ protected void toogleShow(VpeController vpeController,
+ boolean state) {
+ vpeController.getVisualBuilder().setShowInvisibleTags(state);
}
- public void updateElement(UIElement element, Map parameters) {
- super.updateElement(element, parameters);
- boolean toggleState = JspEditorPlugin.getDefault().getPreferenceStore()
- .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
-
- IEditorReference[] openedEditors = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage()
- .getEditorReferences();
- for (IEditorReference openedEditor : openedEditors) {
- IEditorPart editor = openedEditor.getEditor(true);
- toggleShowNonVisualElements(editor, toggleState);
- }
+ @Override
+ public String getPreferenceKey() {
+ return IVpePreferencesPage.SHOW_NON_VISUAL_TAGS;
}
-
- private void toggleShowNonVisualElements(IEditorPart editor,
- boolean toggleState) {
-
- if (!(editor instanceof JSPMultiPageEditor)) {
- return;
- }
-
- JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
- VpeController vpeController = (VpeController) jspEditor
- .getVisualEditor().getController();
- if (vpeController == null) {
- return;
- }
-
- /*
- * Change flag
- */
- vpeController.getVisualBuilder().setShowInvisibleTags(toggleState);
- /*
- * Update VPE
- */
- vpeController.visualRefresh();
- }
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowOptionAbstractHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowOptionAbstractHandler.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowOptionAbstractHandler.java 2010-11-10 10:44:19 UTC (rev 26404)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+
+/**
+ * @author mareshkau
+ *
+ */
+public abstract class ShowOptionAbstractHandler extends VisualPartAbstractHandler{
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ boolean toggleState = !HandlerUtil.toggleCommandState(event
+ .getCommand());
+
+ JspEditorPlugin
+ .getDefault()
+ .getPreferenceStore()
+ .setValue(getPreferenceKey(),
+ toggleState);
+
+ IEditorReference[] openedEditors = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage()
+ .getEditorReferences();
+ for (IEditorReference openedEditor : openedEditors) {
+ IEditorPart editor = openedEditor.getEditor(true);
+ toggleShowOption(editor, toggleState);
+ }
+ return null;
+ }
+ private void toggleShowOption(IEditorPart editor, boolean toggleState) {
+
+ if (!(editor instanceof JSPMultiPageEditor)) {
+ return;
+ }
+
+ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor;
+ VpeController vpeController = (VpeController) jspEditor
+ .getVisualEditor().getController();
+ if (vpeController == null) {
+ return;
+ }
+
+ /*
+ * Set new value to VpeVisualDomBuilder.
+ */
+ toogleShow(vpeController,toggleState);
+ /*
+ * Update VPE
+ */
+ vpeController.visualRefresh();
+ }
+ public abstract String getPreferenceKey();
+ /**
+ * Here should be changed appropriate property in visual builder
+ * @param vpeVisualDomBuilder
+ * @param state
+ */
+ protected abstract void toogleShow(VpeController vpeController, boolean state);
+}
15 years, 5 months
JBoss Tools SVN: r26403 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-11-10 05:35:55 -0500 (Wed, 10 Nov 2010)
New Revision: 26403
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
Log:
bot extensions: added method for searching for browser
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-10 10:00:09 UTC (rev 26402)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-11-10 10:35:55 UTC (rev 26403)
@@ -103,6 +103,16 @@
}
@SuppressWarnings("unchecked")
+ public SWTBotBrowserExt browserExt() {
+ try {
+ List<Browser> bsrs = (List<Browser>) widgetOfType(Browser.class);
+ return new SWTBotBrowserExt(bsrs.get(0));
+ } catch (WidgetNotFoundException ex) {
+ throw new WidgetNotFoundException(
+ "Could not find widget of type Browser", ex);
+ }
+ }
+ @SuppressWarnings("unchecked")
public SWTBotBrowserExt browserByTitle(String title) {
SWTBotEditor editor = editorByTitle(title);
try {
15 years, 5 months
JBoss Tools SVN: r26402 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-11-10 05:00:09 -0500 (Wed, 10 Nov 2010)
New Revision: 26402
Added:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
Log:
minor updates realted to swtbot 2.0.1
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-11-10 07:27:01 UTC (rev 26401)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-11-10 10:00:09 UTC (rev 26402)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-10 07:27:01 UTC (rev 26401)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-10 10:00:09 UTC (rev 26402)
@@ -19,8 +19,7 @@
org.jboss.tools.struts.ui;bundle-version="3.1.0",
org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0",
org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
- org.junit4;bundle-version="4.5.0",
- org.eclipse.ui.browser;bundle-version="3.3.0"
+ org.junit4;bundle-version="4.5.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch (rev 0)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/StrutsAllBotTests.launch 2010-11-10 10:00:09 UTC (rev 26402)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.struts.ui.bot.test.StrutsAllBotTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.struts.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-10 07:27:01 UTC (rev 26401)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-11-10 10:00:09 UTC (rev 26402)
@@ -160,9 +160,11 @@
s.select();
w1 = s.widget;
DndSupport.dnd((TreeItem) w1, (FigureCanvas) c);
+ bot.sleep(500);
ge.clickContextMenu("Auto-Layout");
SWTBotShell sh = bot.activeShell();
sh.bot().button("OK").click();
+ bot.sleep(500);
//2.2.2. Creating an Action Mappings
new SWTBotGefContextMenu(c, "Action...").click();
@@ -177,15 +179,20 @@
ge.activateTool("Create New Connection");
SWTBotGefEditPart part = ge.mainEditPart();
part.descendants(new PartMatcher("inputname.jsp")).get(0).click();
+ bot.sleep(500);
part.descendants(new PartMatcher("GetNameForm")).get(0).click();
+ bot.sleep(500);
//2.2.4. Creating a Forward
ge.activateTool("Create New Connection");
part.descendants(new PartMatcher("GetNameForm")).get(0).click();
+ bot.sleep(500);
part.descendants(new PartMatcher("greeting.jsp")).get(0).click();
+ bot.sleep(500);
ge.clickContextMenu("Auto-Layout");
sh = bot.activeShell();
sh.bot().button("OK").click();
+ bot.sleep(500);
botEditor.save();
ge.selectPage("Tree");
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-10 07:27:01 UTC (rev 26401)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-10 10:00:09 UTC (rev 26402)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.struts.ui.bot.test.utils;
import java.lang.reflect.Field;
15 years, 5 months
JBoss Tools SVN: r26401 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-11-10 02:27:01 -0500 (Wed, 10 Nov 2010)
New Revision: 26401
Modified:
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRuntime.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotBrowserExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Use BRMS runtime and client jars for Drools SWTBot tests.
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-10 06:15:09 UTC (rev 26400)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-10 07:27:01 UTC (rev 26401)
@@ -51,7 +51,7 @@
DomainSpecificLanguageEditorTest.class,
RuleFlowTest.class,
DecisionTableTest.class,
- GuvnorRepositoriesTest.class})
+ GuvnorRepositoriesTest.class})
public class DroolsAllBotTests extends SWTTestExt {
public static final String DROOLS_PROJECT_NAME = "droolsTest";
public static final String DROOLS_RUNTIME_NAME = "Drools Test Runtime";
@@ -68,7 +68,10 @@
public static final String RULE_FLOW_JAVA_TEST_FILE_NAME = "ProcessTest.java";
public static final String RULE_FLOW_RF_FILE_NAME = "ruleflow.rf";
public static final String DECISION_TABLE_JAVA_TEST_FILE_NAME = "DecisionTableTest.java";
- public static final String EAP_50_WITH_GUVNOR_PROPERTY_NAME= "jboss-eap5.0-with-drools-home";
+ public static final String USE_EXTERNAL_DROOLS_RUNTIME_PROPERTY_NAME= "use-external-drools-runtime";
+ public static final String EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME= "external-drools-runtime-home";
+ private static boolean USE_EXTERNAL_DROOLS_RUNTIME;
+
private static String testDroolsRuntimeName = null;
public static String getTestDroolsRuntimeName() {
return testDroolsRuntimeName;
@@ -90,11 +93,20 @@
@BeforeClass
public static void setUpTest() {
jbt.closeReportUsageWindowIfOpened(false);
- DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = System.getProperty("java.io.tmpdir");
- DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION = DroolsAllBotTests.DROOLS_RUNTIME_LOCATION + File.separator + "drools";
+ properties = util.loadProperties(Activator.PLUGIN_ID);
+ String useExternalDroolRuntime = properties.getProperty(DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME_PROPERTY_NAME);
+ DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME = useExternalDroolRuntime != null && useExternalDroolRuntime.equalsIgnoreCase("true");
+ String droolsRuntimeLocation = properties.getProperty(DroolsAllBotTests.EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME);
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ if (droolsRuntimeLocation == null || droolsRuntimeLocation.length() ==0){
+ DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = tmpDir;
+ }
+ else{
+ DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = droolsRuntimeLocation;
+ }
+ DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION = tmpDir + File.separator + "drools";
// Create directory for Drools Runtime which will be created as a part of test
new File(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION).mkdir();
- properties = util.loadProperties(Activator.PLUGIN_ID);
try{
SWTBotView welcomeView = eclipse.getBot().viewByTitle(IDELabel.View.WELCOME);
welcomeView.close();
@@ -105,6 +117,10 @@
eclipse.maximizeActiveShell();
}
+ public static boolean useExternalDroolsRuntime() {
+ return USE_EXTERNAL_DROOLS_RUNTIME;
+ }
+
@AfterClass
public static void tearDownTest() {
// delete created drools runtime
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-11-10 06:15:09 UTC (rev 26400)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-11-10 07:27:01 UTC (rev 26401)
@@ -27,7 +27,6 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Matcher;
@@ -36,7 +35,6 @@
import org.jboss.tools.ui.bot.ext.config.requirement.RequirementNotFulfilledException;
import org.jboss.tools.ui.bot.ext.config.requirement.StartServer;
import org.jboss.tools.ui.bot.ext.config.requirement.StopServer;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.GuvnorGuvnorResourceHistory;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.helper.DragAndDropHelper;
@@ -63,13 +61,14 @@
private static final String GUVNOR_TEST_FILE = "Dummy rule.drl";
private static final String GUVNOR_REPOSITORY_IMPORT_TEST_FILE = "Underage.brl";
private static final String GUVNOR_REPOSITORY_HISTORY_TEST_FILE = "MortgageModel.model.drl";
+ private static final String GUVNOR_USER_NAME = "admin";
+ private static final String GUVNOR_PASSWORD = "admin";
private GuvnorRepositories guvnorRepositories = new GuvnorRepositories();
/**
* Tests Guvnor Repositories
*/
@Test
public void testGuvnorRepositories() {
- setGuvnorTemplate();
startGuvnor();
addGuvnorRepository();
deleteGuvnorRepository();
@@ -128,6 +127,8 @@
IDELabel.Menu.OPEN_GUVNOR_CONSOLE, false)).click();
bot.sleep(Timing.time5S());
SWTBotBrowserExt browser = bot.browserByTitle(IDELabel.GuvnorConsole.GUVNOR_CONSOLE_TITLE);
+ browser.setInputTextViaJavaScript(GuvnorRepositoriesTest.GUVNOR_USER_NAME, 0, bot);
+ browser.setInputTextViaJavaScript(GuvnorRepositoriesTest.GUVNOR_PASSWORD, 1, bot);
browser.clickOnButtonViaJavaScript(0, bot);
browser.clickOnButtonViaJavaScript(IDELabel.GuvnorConsole.BUTTON_YES_INSTALL_SAMPLES, bot);
bot.sleep(Timing.time1S());
@@ -349,8 +350,18 @@
}
private void drillIntoFunctionalityCheck(){
SWTBotView guvnorReposioryView = guvnorRepositories.show();
- guvnorRepositories.selectTreeItem(Timing.time2S(), IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM,
- new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM});
+ SWTBotTreeItem tiRoot = guvnorRepositories.selectTreeItem(IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM,null)
+ .doubleClick();
+ bot.sleep(Timing.time2S());
+ SWTBot dialogBot = bot.shell("").activate().bot();
+ dialogBot.textWithLabel(IDELabel.GuvnorConsoleLoginDialog.USER_NAME).setText(
+ GuvnorRepositoriesTest.GUVNOR_USER_NAME);
+ dialogBot.textWithLabel(IDELabel.GuvnorConsoleLoginDialog.PASSWORD).setText(
+ GuvnorRepositoriesTest.GUVNOR_PASSWORD);
+ dialogBot.button(IDELabel.Button.OK).click();
+ tiRoot.expand();
+ bot.sleep(Timing.time2S());
+ tiRoot.select(IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM);
SWTUtilExt.getViewToolbarButtonWithTooltip(guvnorReposioryView,
IDELabel.GuvnorRepositories.GO_INTO_GUVNOR_REPOSITORY_TOOLTIP)
.click();
@@ -511,14 +522,5 @@
"Content should start with " + addedChange +
"\n but is " + editorText,editorText.startsWith(addedChange));
}
- /**
- * Sets properly Guvnor Template
- */
- private void setGuvnorTemplate(){
- SWTBot dialogBot = open.preferenceOpen(ActionItem.Preference.Guvnor.LABEL);
- SWTBotText guvnorTemplateText = dialogBot.textWithLabel(IDELabel.GuvnorPropertiesDialog.GUVNOR_URL_TEMPLATE);
- guvnorTemplateText.setText(guvnorTemplateText.getText().replaceFirst("jboss-brms", "drools-guvnor"));
- dialogBot.button(IDELabel.Button.OK).click();
- SWTEclipseExt.hideWarningIfDisplayed(bot);
- }
+
}
\ No newline at end of file
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRuntime.java
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRuntime.java 2010-11-10 06:15:09 UTC (rev 26400)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRuntime.java 2010-11-10 07:27:01 UTC (rev 26401)
@@ -35,19 +35,24 @@
*/
@Test
public void testManageDroolsRuntime() {
- addDroolsRuntime(DroolsAllBotTests.DROOLS_RUNTIME_NAME,DroolsAllBotTests.DROOLS_RUNTIME_LOCATION);
+ addDroolsRuntime(DroolsAllBotTests.DROOLS_RUNTIME_NAME,DroolsAllBotTests.DROOLS_RUNTIME_LOCATION,true);
editDroolsRuntime(DroolsAllBotTests.getTestDroolsRuntimeName(),
DroolsAllBotTests.getTestDroolsRuntimeLocation(),
"edited" , "testedit");
removeDroolsRuntime(DroolsAllBotTests.getTestDroolsRuntimeName());
createDroolsRuntime(DroolsAllBotTests.DROOLS_RUNTIME_NAME,DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION);
+ if (DroolsAllBotTests.useExternalDroolsRuntime()){
+ removeDroolsRuntime(DroolsAllBotTests.DROOLS_RUNTIME_NAME);
+ addDroolsRuntime(DroolsAllBotTests.DROOLS_RUNTIME_NAME,DroolsAllBotTests.DROOLS_RUNTIME_LOCATION,true);
+ }
}
/**
* Adds Drools Runtime
* @param runtimeName
* @param runtimeLocation
+ * @param setAsDefault
*/
- private void addDroolsRuntime(String runtimeName, String runtimeLocation){
+ private void addDroolsRuntime(String runtimeName, String runtimeLocation, boolean setAsDefault){
selectDroolsPreferences();
bot.button(IDELabel.Button.ADD).click();
bot.shell(IDELabel.Shell.DROOLS_RUNTIME).activate();
@@ -59,12 +64,17 @@
boolean droolsRuntimeAdded =
SWTEclipseExt.isItemInTableColumn(table,runtimeName,IDELabel.DroolsRuntimeDialog.COLUMN_NAME_INDEX)
&& SWTEclipseExt.isItemInTableColumn(table,runtimeLocation,IDELabel.DroolsRuntimeDialog.COLUMN_LOCATION_INDEX);
+ // Set new runtime as default
+ if (setAsDefault){
+ table.getTableItem(0).check();
+ }
bot.button(IDELabel.Button.OK).click();
assertTrue("Drools Runtime with name [" + runtimeName +
"] and location [" + runtimeLocation +
"] was not added properly.",droolsRuntimeAdded);
DroolsAllBotTests.setTestDroolsRuntimeName(runtimeName);
DroolsAllBotTests.setTestDroolsRuntimeLocation(runtimeLocation);
+ SWTEclipseExt.hideWarningIfDisplayed(bot);
}
/**
* Selects Drools Preferences within Preferences Dialog
@@ -107,6 +117,7 @@
"] was not renamed properly.",droolsRuntimeEdited);
DroolsAllBotTests.setTestDroolsRuntimeName(editedDroolsRuntimeName);
DroolsAllBotTests.setTestDroolsRuntimeLocation(editedDroolsRuntimeLocation);
+ SWTEclipseExt.hideWarningIfDisplayed(bot);
}
/**
@@ -125,7 +136,7 @@
assertTrue("Drools Runtime with name [" + runtimeName +
"] was not removed properly.",droolsRuntimeRemoved);
// Remove temporary directory created within editDroolsRuntime() method
- if (!DroolsAllBotTests.getTestDroolsRuntimeLocation().equals(DroolsAllBotTests.DROOLS_RUNTIME_NAME)){
+ if (!DroolsAllBotTests.getTestDroolsRuntimeName().equals(DroolsAllBotTests.DROOLS_RUNTIME_NAME)){
File tempDir = new File (DroolsAllBotTests.getTestDroolsRuntimeLocation());
if (tempDir.isDirectory()){
tempDir.delete();
@@ -133,6 +144,7 @@
}
DroolsAllBotTests.setTestDroolsRuntimeName(null);
DroolsAllBotTests.setTestDroolsRuntimeLocation(null);
+ SWTEclipseExt.hideWarningIfDisplayed(bot);
}
/**
* Creates Drools Runtime
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotBrowserExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotBrowserExt.java 2010-11-10 06:15:09 UTC (rev 26400)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/SWTBotBrowserExt.java 2010-11-10 07:27:01 UTC (rev 26401)
@@ -235,4 +235,15 @@
new SWTUtilExt(bot).waitForBrowserLoadsPage(this);
bot.sleep(Timing.time5S());
}
+ /**
+ * Set Text of Input on position specified by index via Java script
+ * @param text
+ * @param index
+ */
+ public void setInputTextViaJavaScript(String text, int index,SWTWorkbenchBot bot){
+ executeScriptAsync("document.getElementsByTagName('input')[" +
+ index +
+ "].value = \""+ text +"\";");
+ bot.sleep(Timing.time5S());
+ }
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-10 06:15:09 UTC (rev 26400)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-10 07:27:01 UTC (rev 26401)
@@ -151,6 +151,8 @@
public static final String ADD_PALETTE_MACRO = "Add Palette Macro";
public static final String CONFIRMATION = "Confirmation";
public static final String USER_SPECIFIED_TAG_TEMPLATE = "User specified tag template";
+ public static final String PAGE_DESIGN_OPTIONS = "Page Design Options";
+ public static final String ADD_TAGLIB_REFRENCE = "Add Taglib Reference";
}
public class EntityGroup {
@@ -497,7 +499,7 @@
public static final String ADD_GUVNOR_REPOSITORY_TOOLTIP = "Add a Guvnor respository connection";
public static final String REMOVE_GUVNOR_REPOSITORY_TOOLTIP = "Delete Guvnor repository connection";
public static final String REMOVE_GUVNOR_REPOSITORY_DIALOG_TITLE = "Remove repository connection";
- public static final String GUVNOR_REPOSITORY_ROOT_TREE_ITEM = "http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav/";
+ public static final String GUVNOR_REPOSITORY_ROOT_TREE_ITEM = "http://localhost:8080/jboss-brms/org.drools.guvnor.Guvnor/webdav/";
public static final String PACKAGES_TREE_ITEM = "packages/";
public static final String MORTGAGE_TREE_ITEM = "mortgages/";
public static final String GO_INTO_GUVNOR_REPOSITORY_TOOLTIP = "Go Into";
@@ -509,7 +511,7 @@
public static final class GuvnorConsole {
- public static final String GUVNOR_CONSOLE_TITLE = "JBoss Guvnor";
+ public static final String GUVNOR_CONSOLE_TITLE = "JBoss BRMS";
public static final String BUTTON_YES_INSTALL_SAMPLES = "Yes, please install samples";
}
@@ -595,4 +597,22 @@
}
+ public static class PageDesignOptionsDialog{
+
+ public static final String INCLUDED_TAG_LIBS_TAB = "Included tag tibs";
+
+ }
+
+ public static class AddTaglibReferenceDialog{
+
+ public static final String INCLUDED_TAG_LIBS_TAB = "Included tag libs";
+
+ }
+
+ public static class GuvnorConsoleLoginDialog{
+
+ public static final String USER_NAME = "User Name: ";
+ public static final String PASSWORD = "Password: ";
+
+ }
}
15 years, 5 months
JBoss Tools SVN: r26400 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-10 01:15:09 -0500 (Wed, 10 Nov 2010)
New Revision: 26400
Added:
trunk/build/target-platform/.gitignore
Log:
add .gitignore
Added: trunk/build/target-platform/.gitignore
===================================================================
--- trunk/build/target-platform/.gitignore (rev 0)
+++ trunk/build/target-platform/.gitignore 2010-11-10 06:15:09 UTC (rev 26400)
@@ -0,0 +1 @@
+local.target*
15 years, 5 months
JBoss Tools SVN: r26399 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-10 01:15:01 -0500 (Wed, 10 Nov 2010)
New Revision: 26399
Modified:
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add missing prefix // on file: URLs
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2010-11-10 06:14:53 UTC (rev 26398)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2010-11-10 06:15:01 UTC (rev 26399)
@@ -25,7 +25,7 @@
<property name="verbose" value="false"/>
<property name="followStrict" value="false"/>
<echo level="info">Download features/plugins into ${repoDir}</echo>
-<p2.mirror destination="file:${repoDir}" verbose="${verbose}">
+<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
15 years, 5 months
JBoss Tools SVN: r26398 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-10 01:14:53 -0500 (Wed, 10 Nov 2010)
New Revision: 26398
Modified:
trunk/build/target-platform/README.txt
trunk/build/target-platform/build.xml
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/target2p2mirrorXml.xsl
trunk/build/target-platform/targetUpdateFromRepo.xml
Log:
add missing prefix // on file: URLs
Modified: trunk/build/target-platform/README.txt
===================================================================
--- trunk/build/target-platform/README.txt 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/README.txt 2010-11-10 06:14:53 UTC (rev 26398)
@@ -44,7 +44,7 @@
but a local path reference is faster.
2. So, continuing from previous HOWTO, copy from /tmp/mutiple.target into
- file://home/hudson/static_build_env/jbds/target-platform/mutiple.target/
+ file:///home/hudson/static_build_env/jbds/target-platform/mutiple.target/
rsync -aPrz --delete /tmp/mutiple.target/* \
/home/hudson/static_build_env/jbds/target-platform/mutiple.target/ &
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/build.xml 2010-11-10 06:14:53 UTC (rev 26398)
@@ -196,10 +196,10 @@
<target name="test.local.target.platform.repo" description="test target platform completeness by running a build against its update site">
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
- <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file:/${repoDir}" />
+ <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file://${repoDir}" />
</exec>
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
- <arg line=" -f ../pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file:/${repoDir}" />
+ <arg line=" -f ../pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file://${repoDir}" />
</exec>
</target>
@@ -207,7 +207,7 @@
description="test target platform completeness by running a build against its installed eclipse base - Dtycho.targetPlatform to be removed in Tycho 0.11 so this test is deprecated">
<!--
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
- <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file:/${repoDir}" />
+ <arg line=" -f ../parent/pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip -Dtarget.platorm.URL=file://${repoDir}" />
</exec>
<exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
<arg line=" -f ../pom.xml clean install -B -U -fae -e -Dmaven.test.skip -Dtycho.targetPlatform=${WORKINGDIR}/eclipse" />
@@ -255,7 +255,7 @@
<antcall target="run.director">
<param name="p2.director.installIU" value="${install}" />
<param name="p2.director.install.path" value="${WORKINGDIR}/eclipse" />
- <param name="p2.director.input.repo" value="file:/${repoDir}/" />
+ <param name="p2.director.input.repo" value="file://${repoDir}/" />
</antcall>
</target>
@@ -263,7 +263,7 @@
<property name="p2.director.extraArgs" value="" />
<property name="p2.director.installIU" value="${install}" />
<property name="p2.director.install.path" value="${targetDir}" />
- <property name="p2.director.input.repo" value="jar:file:${sourceZip}!/" />
+ <property name="p2.director.input.repo" value="jar:file://${sourceZip}!/" />
<echo>
Source Repo(s): ${p2.director.input.repo}
Install Path: ${p2.director.install.path}
@@ -284,8 +284,8 @@
<arg line=" -destination ${p2.director.install.path}" />
<arg line=" -bundlepool ${p2.director.install.path}" />
<arg line=" -installIU ${p2.director.installIU}" />
- <arg line=" -metadataRepository ${p2.director.input.repo},file:${p2.director.install.path}/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" />
- <arg line=" -artifactRepository ${p2.director.input.repo},file:${p2.director.install.path}" />
+ <arg line=" -metadataRepository ${p2.director.input.repo},file://${p2.director.install.path}/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" />
+ <arg line=" -artifactRepository ${p2.director.input.repo},file://${p2.director.install.path}" />
<arg line=" -profileProperties org.eclipse.update.install.features=true" />
<arg line=" -vmargs" />
<arg line=" -Declipse.p2.data.area=${p2.director.install.path}/p2" />
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2010-11-10 06:14:53 UTC (rev 26398)
@@ -25,7 +25,7 @@
<property value="false" name="verbose"/>
<property value="false" name="followStrict"/>
<echo level="info">Download features/plugins into ${repoDir}</echo>
-<p2.mirror verbose="${verbose}" destination="file:${repoDir}">
+<p2.mirror verbose="${verbose}" destination="file://${repoDir}">
<slicingOptions followStrict="${followStrict}" includeFeatures="true"/>
<source>
<repository location="http://download.eclipse.org/releases/helios/"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/multiple.target 2010-11-10 06:14:53 UTC (rev 26398)
@@ -228,4 +228,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2010-11-10 06:14:53 UTC (rev 26398)
@@ -25,7 +25,7 @@
<property value="false" name="verbose"/>
<property value="false" name="followStrict"/>
<echo level="info">Download features/plugins into ${repoDir}</echo>
-<p2.mirror verbose="${verbose}" destination="file:${repoDir}">
+<p2.mirror verbose="${verbose}" destination="file://${repoDir}">
<slicingOptions followStrict="${followStrict}" includeFeatures="true"/>
<source>
<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
Modified: trunk/build/target-platform/target2p2mirrorXml.xsl
===================================================================
--- trunk/build/target-platform/target2p2mirrorXml.xsl 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/target2p2mirrorXml.xsl 2010-11-10 06:14:53 UTC (rev 26398)
@@ -13,7 +13,7 @@
<xsl:param name="verbose" select="'${verbose}'" as="xs:string"/>
<xsl:param name="followStrict" select="'${followStrict}'" as="xs:string"/>
- <xsl:param name="destination" select="'file:${repoDir}'" as="xs:string"/>
+ <xsl:param name="destination" select="'file://${repoDir}'" as="xs:string"/>
<xsl:template match="target">
<project name="Download target platform" default="download.target.platform">
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-10 06:14:41 UTC (rev 26397)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2010-11-10 06:14:53 UTC (rev 26398)
@@ -14,7 +14,7 @@
<property name="unified.targetFile" value="unified.target" />
<property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform/latest/" />
<property name="local.targetFile" value="local.target" />
- <property name="local.URL" value="file:/${repoDir}" />
+ <property name="local.URL" value="file://${repoDir}" />
<property name="tmpDir" value="${java.io.tmpdir}/targetUpdateFromRepo" />
15 years, 5 months
JBoss Tools SVN: r26397 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-10 01:14:41 -0500 (Wed, 10 Nov 2010)
New Revision: 26397
Modified:
trunk/build/target-platform/publish.sh
Log:
make target dir if not exist
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2010-11-09 20:37:09 UTC (rev 26396)
+++ trunk/build/target-platform/publish.sh 2010-11-10 06:14:41 UTC (rev 26397)
@@ -26,7 +26,10 @@
if [[ -d ${repoPath} ]]; then
cd ${repoPath}
- du -sh ${repoPath}; if [[ -d ${destinationPath}/${targetFile} ]]; then du -sh ${destinationPath}/${targetFile}; fi
+ if [[ ! -d ${destinationPath}/${targetFile} ]]; then
+ mkdir -p ${destinationPath}/${targetFile}
+ fi
+ du -sh ${repoPath} ${destinationPath}/${targetFile}
# copy/update into central place for reuse by local downstream build jobs
date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh --exclude '.blobstore' * ${destinationPath}/${targetFile}/
15 years, 5 months