February 2011 - jbosstools-commits

JBoss Tools SVN: r29109 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-02-11 07:00:28 -0500 (Fri, 11 Feb 2011) New Revision: 29109 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java Log: JBIDE-8264 https://issues.jboss.org/browse/JBIDE-8264 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2011-02-11 09:41:35 UTC (rev 29108) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2011-02-11 12:00:28 UTC (rev 29109) @@ -36,12 +36,15 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; +import org.eclipse.ui.menus.IWorkbenchWidget; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.XModelObject; @@ -178,6 +181,9 @@ } if(wizard == null) { wizard = new NewClassWizard(); + } + if(wizard instanceof IWorkbenchWizard) { + ((IWorkbenchWizard)wizard).init(ModelUIPlugin.getDefault().getWorkbench(), new StructuredSelection()); } wizard.setAdapter(wizardAdapter); WizardDialog dialog = new WizardDialog(ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29108 - in trunk/common/plugins/org.jboss.tools.common.model.ui: templates and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-02-11 04:41:35 -0500 (Fri, 11 Feb 2011) New Revision: 29108 Added: trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.properties trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.xml Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml Log: JBIDE-8227 https://issues.jboss.org/browse/JBIDE-8227 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2011-02-11 00:26:13 UTC (rev 29107) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2011-02-11 09:41:35 UTC (rev 29108) @@ -286,6 +286,8 @@ </include> <include file="templates/web-facesconfig_1_2.xml" translations="templates/web-facesconfig_1_2.properties"> </include> + <include file="templates/web-facesconfig_2_0.xml" translations="templates/web-facesconfig_2_0.properties"> + </include> </extension> Added: trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.properties =================================================================== Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.xml (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.xml 2011-02-11 09:41:35 UTC (rev 29108) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE meta-template PUBLIC "-//Red Hat Inc.//DTD Meta Templates 1.0//EN" + "http://www.redhat.com/templates/dtds/meta-template_1_0.dtd"> + +<meta-templates uri="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> + +  + + <meta-template axis="action-listener/text()[1]" displayName="Action Listener" xEntity="NONE"> + <interface name="javax.faces.event.ActionListener"/> + </meta-template> + + <meta-template axis="navigation-handler/text()[1]" displayName="Navigation Handler" xEntity="NONE"> + <super-class name="javax.faces.application.NavigationHandler"/> + </meta-template> + + <meta-template axis="view-handler/text()[1]" displayName="View Handler" xEntity="NONE"> + <super-class name="javax.faces.application.ViewHandler"/> + </meta-template> + + <meta-template axis="state-manager/text()[1]" displayName="State Manager" xEntity="NONE"> + <super-class name="javax.faces.application.StateManager"/> + </meta-template> + + <meta-template axis="resource-handler/text()[1]" displayName="Resource Handler" xEntity="NONE"> + <super-class name="javax.faces.application.ResourceHandler"/> + </meta-template> + + <meta-template axis="property-resolver/text()[1]" displayName="Property Resolver" xEntity="NONE"> + <super-class name="javax.faces.el.PropertyResolver"/> + </meta-template> + + <meta-template axis="variable-resolver/text()[1]" displayName="Variable Resolver" xEntity="NONE"> + <super-class name="javax.faces.el.VariableResolver"/> + </meta-template> + +  + + <meta-template axis="application-factory/text()[1]" displayName="Application Factory" xEntity="NONE"> + <super-class name="javax.faces.application.ApplicationFactory"/> + </meta-template> + + <meta-template axis="faces-context-factory/text()[1]" displayName="Faces Context Factory" xEntity="NONE"> + <super-class name="javax.faces.context.FacesContextFactory"/> + </meta-template> + + <meta-template axis="lifecycle-factory/text()[1]" displayName="Lifecycle Factory" xEntity="NONE"> + <super-class name="javax.faces.lifecycle.LifecycleFactory"/> + </meta-template> + + <meta-template axis="render-kit-factory/text()[1]" displayName="Render Kit Factory" xEntity="NONE"> + <super-class name="javax.faces.render.RenderKitFactory"/> + </meta-template> + + <meta-template axis="exception-handler-factory/text()[1]" displayName="Exception Handler Factory" xEntity="NONE"> + <super-class name="javax.faces.context.ExceptionHandlerFactory"/> + </meta-template> + + <meta-template axis="external-context-factory/text()[1]" displayName="External Contex Factory" xEntity="NONE"> + <super-class name="javax.faces.context.ExternalContextFactory"/> + </meta-template> + + <meta-template axis="partial-view-context-factory/text()[1]" displayName="Partial View Contex Factory" xEntity="NONE"> + <super-class name="javax.faces.context.PartialViewContextFactory"/> + </meta-template> + + <meta-template axis="view-declaration-language-factory/text()[1]" displayName="View Declaration Language Factory" xEntity="NONE"> + <super-class name="javax.faces.view.ViewDeclarationLanguageFactory"/> + </meta-template> + + <meta-template axis="tag-handler-delegate-factory/text()[1]" displayName="Tag Handler Delegate Factory" xEntity="NONE"> + <super-class name="javax.faces.view.facelets.TagHandlerDelegateFactory"/> + </meta-template> + + <meta-template axis="visit-context-factory/text()[1]" displayName="Tag Handler Delegate Factory" xEntity="NONE"> + <super-class name="javax.faces.component.visit.VisitContextFactory"/> + </meta-template> + +  + + <meta-template axis="phase-listener/text()[1]" displayName="Phase Listener" xEntity="NONE"> + <interface name="javax.faces.event.PhaseListener"/> + </meta-template> + +  + + <meta-template axis="validator-class/text()[1]" displayName="Validator Class" xEntity="NONE"> + <interface name="javax.faces.validator.Validator"/> + </meta-template> + +  +  + +  + + <meta-template axis="converter-class/text()[1]" displayName="Converter Class" xEntity="NONE"> + <interface name="javax.faces.convert.Converter"/> + </meta-template> + +  +  + +  + + <meta-template axis="render-kit-class/text()[1]" displayName="Render Kit Class" xEntity="NONE"> + <super-class name="javax.faces.render.RenderKit"/> + </meta-template> + + <meta-template axis="renderer-class/text()[1]" displayName="Renderer Class" xEntity="NONE"> + <super-class name="javax.faces.render.Renderer"/> + </meta-template> + +  + + <meta-template axis="component-class/text()[1]" displayName="Component Class" xEntity="NONE"> + <super-class name="javax.faces.component.UIComponent"/> + </meta-template> + +  + + <meta-template axis="behavior-class/text()[1]" displayName="Behavior Class" xEntity="NONE"> + <super-class name="javax.faces.component.behavior.BehaviorBase"/> + </meta-template> + +</meta-templates> \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.model.ui/templates/web-facesconfig_2_0.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29107 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration: src/org/jboss/tools/deltacloud/integration/rse/util and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-02-10 19:26:13 -0500 (Thu, 10 Feb 2011) New Revision: 29107 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java Log: JBIDE-8372 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF 2011-02-10 17:08:23 UTC (rev 29106) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF 2011-02-11 00:26:13 UTC (rev 29107) @@ -26,8 +26,9 @@ org.jboss.tools.deltacloud.core, org.jboss.tools.deltacloud.ui, org.jboss.ide.eclipse.as.core, - org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)", - org.jboss.ide.eclipse.as.rse.core;bundle-version="[0.9.0,2.0.0)", - org.eclipse.wst.server.core;bundle-version="[1.1.204,2.0.0)", - org.eclipse.wst.server.ui;bundle-version="[1.1.205,2.0.0)", - org.eclipse.jsch.core;bundle-version="1.1.200" + org.eclipse.core.resources, + org.jboss.ide.eclipse.as.rse.core, + org.eclipse.wst.server.core, + org.eclipse.wst.server.ui, + org.eclipse.jsch.core, + com.jcraft.jsch Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-10 17:08:23 UTC (rev 29106) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-11 00:26:13 UTC (rev 29107) @@ -29,6 +29,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.core.subsystems.IConnectorService; +import org.eclipse.rse.services.clientserver.messages.SystemOperationFailedException; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PartInitException; @@ -39,6 +40,8 @@ import org.jboss.tools.deltacloud.integration.wizard.CreateServerFromRSEJob; import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils; +import com.jcraft.jsch.JSchException; + /** * @author André Dietisheim */ @@ -137,6 +140,15 @@ monitor.done(); return Status.CANCEL_STATUS; } catch (Exception e) { + if( e instanceof SystemOperationFailedException) { + Throwable t = ((SystemOperationFailedException) e).getRemoteException(); + if( t instanceof JSchException) { + // User clicked no on accept hostkey + if(t.getMessage().contains("reject HostKey:")) + return Status.CANCEL_STATUS; + } + } + monitor.worked(getProgress(current, last, scale)); last = current; if (current < start + timeout) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-10 17:08:23 UTC (rev 29106) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-11 00:26:13 UTC (rev 29107) @@ -12,12 +12,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.osgi.util.NLS; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.services.clientserver.messages.SystemOperationFailedException; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.swt.widgets.Display; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; @@ -29,6 +31,8 @@ import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; import org.osgi.service.prefs.Preferences; +import com.jcraft.jsch.JSchException; + public class CreateRSEFromInstanceJob extends AbstractInstanceJob { /** the timeout for trying to connect to the new instance */ private static final long CONNECT_TIMEOUT = 3 * 60 * 1000; @@ -60,8 +64,11 @@ ((CreateServerFromRSEJob)nextJob2).setHost(host); } monitor.worked(10); - triggerCredentialsDialog(host, new SubProgressMonitor(monitor, 10)); - return RSEUtils.connect(RSEUtils.getConnectorService(host), CONNECT_TIMEOUT, new SubProgressMonitor(monitor, 80)); + IStatus credentials = + triggerCredentialsDialog(host, new SubProgressMonitor(monitor, 10)); + if( credentials.isOK()) + return RSEUtils.connect(RSEUtils.getConnectorService(host), CONNECT_TIMEOUT, new SubProgressMonitor(monitor, 80)); + return credentials; } catch (Exception e) { return ErrorUtils.handleError(Messages.ERROR, NLS.bind(Messages.COULD_NOT_LAUNCH_RSE_EXPLORER2, instance.getName()), @@ -71,15 +78,25 @@ return Status.OK_STATUS; } - private void triggerCredentialsDialog(IHost host, IProgressMonitor monitor) { + private IStatus triggerCredentialsDialog(IHost host, IProgressMonitor monitor) { try { IRemoteFileSubSystem system = RSEUtils.findRemoteFileSubSystem(host); system.connect(monitor, true /* force credentials dialog */); } catch(Exception e) { - // ignore, expected, the server probably isn't up yet. + if( e instanceof OperationCanceledException) + return Status.CANCEL_STATUS; + if( e instanceof SystemOperationFailedException ) { + Exception f = ((SystemOperationFailedException) e).getRemoteException(); + if( f != null && f instanceof JSchException) { + // User selected No on accept hostkey + if(f.getMessage().contains("reject HostKey:")) + return Status.CANCEL_STATUS; + } + } } finally { monitor.done(); } + return Status.OK_STATUS; } private boolean isAutoconnect() {

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29106 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-02-10 12:08:23 -0500 (Thu, 10 Feb 2011) New Revision: 29106 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java Log: [JBIDE-8354] removed case where null-status was returned, decreased timeout to 3 minutes, now reporting real lapse of time (was: simple stepwise increase), Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-10 17:00:05 UTC (rev 29105) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-10 17:08:23 UTC (rev 29106) @@ -158,7 +158,7 @@ private static int getProgress(long current, long last, double scale) { double progress = (current - last) * scale; - return (int) Math.floor(progress); + return (int) Math.ceil(progress); } public static Job connect(final String connectionName, final IConnectorService service)

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29105 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-02-10 12:00:05 -0500 (Thu, 10 Feb 2011) New Revision: 29105 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog Log: [JBIDE-8354] removed case where null-status was returned, decreased timeout to 3 minutes, now reporting real lapse of time (was: simple stepwise increase), Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog 2011-02-10 16:58:07 UTC (rev 29104) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog 2011-02-10 17:00:05 UTC (rev 29105) @@ -1,3 +1,13 @@ +2011-02-10 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java + (runRSEJob): + (CONNECT_TIMEOUT): + * src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java + (connect): + (getProgress): + [JBIDE-8354] removed case where null-status was returned, decreased timeout to 3 minutes, now reporting real lapse of time (was: simple stepwise increase), + 2011-02-07 André Dietisheim <André Dietisheim@adietisheim-thinkpad> * src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java (createControl):

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29104 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration: wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-02-10 11:58:07 -0500 (Thu, 10 Feb 2011) New Revision: 29104 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java Log: [JBIDE-8354] removed case where null-status was returned, decreased timeout to 3 minutes, now reporting real lapse of time (was: simple stepwise increase), Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-10 16:37:03 UTC (rev 29103) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-10 16:58:07 UTC (rev 29104) @@ -32,6 +32,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PartInitException; +import org.jboss.tools.common.log.StatusFactory; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.integration.DeltaCloudIntegrationPlugin; import org.jboss.tools.deltacloud.integration.Messages; @@ -43,6 +44,7 @@ */ public class RSEUtils { + private static final int RECONNECT_WAIT = 1000; private static final String VIEW_REMOTESYSEXPLORER_ID = "org.eclipse.rse.ui.view.systemView"; public static IRSESystemType getSSHOnlySystemType() { @@ -104,40 +106,62 @@ } public static IStatus connect(IConnectorService service, IProgressMonitor monitor) throws Exception { - monitor.worked(1); service.connect(monitor); - monitor.done(); return Status.OK_STATUS; } - - public static IStatus connect(IConnectorService service, int timeout, IProgressMonitor monitor) { - monitor.beginTask("Connecting to remote server", timeout); + + /** + * Connects to the given service with the given timeout. Progress will be + * reported on the given monitor. + * + * @param service + * the service to connect to + * @param timeout + * the timeout to apply + * @param monitor + * the monitor + * @return the restult of the connection attempt + */ + public static IStatus connect(IConnectorService service, long timeout, IProgressMonitor monitor) { + long start = System.currentTimeMillis(); + double scale = (double) 100 / timeout; + long current = start; + long last = start; + monitor.beginTask("Connecting to remote server", 100); monitor.setTaskName("Connecting to remote server"); - IStatus status = null; - int count = 0; - while( status == null && count < timeout && !monitor.isCanceled()) { + while (!monitor.isCanceled()) { + current = System.currentTimeMillis(); try { - status = connect(service, monitor); + return connect(service, monitor); + } catch (OperationCanceledException oce) { monitor.done(); - return status; - } catch(OperationCanceledException oce) { - monitor.done(); return Status.CANCEL_STATUS; - } catch(Exception e) { - count += 1000; - monitor.worked(1000); - try { - Thread.sleep(1000); - } catch(InterruptedException ie) { + } catch (Exception e) { + monitor.worked(getProgress(current, last, scale)); + last = current; + if (current < start + timeout) { + try { + Thread.sleep(RECONNECT_WAIT); + } catch (InterruptedException ie) { + break; + } + } else { + monitor.done(); + return StatusFactory.getInstance(IStatus.ERROR, DeltaCloudIntegrationPlugin.PLUGIN_ID, + MessageFormat.format("Could not connect to remote server {0}", service.getHostName()), e); } + } } - monitor.done(); - return status; + return Status.CANCEL_STATUS; } - - - public static Job connect(String connectionName, final IConnectorService service) + + private static int getProgress(long current, long last, double scale) { + double progress = (current - last) * scale; + return (int) Math.floor(progress); + } + + public static Job connect(final String connectionName, final IConnectorService service) throws Exception { // TODO: internationalize strings Assert.isLegal(connectionName != null, @@ -148,10 +172,15 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { - return connect(service, monitor); - } catch(Exception e) { + monitor.beginTask(NLS.bind(Messages.RSE_CONNECTING_MESSAGE, connectionName), + IProgressMonitor.UNKNOWN); + IStatus status = connect(service, monitor); + monitor.done(); + return status; + } catch (Exception e) { e.printStackTrace(); - // odd behavior: service reports connection failure even if things seem to work (view opens up with connection in it) + // odd behavior: service reports connection failure even if + // things seem to work (view opens up with connection in it) // ignore errors since things work // // return StatusFactory.getInstance(IStatus.ERROR, @@ -186,8 +215,9 @@ } catch (PartInitException e) { // I have no idea wtf is wrong here // but my dev environment will not let me use common classes -// IStatus status = StatusFactory.getInstance(IStatus.ERROR, -// DeltaCloudIntegrationPlugin.PLUGIN_ID, e.getMessage(), e); + // IStatus status = StatusFactory.getInstance(IStatus.ERROR, + // DeltaCloudIntegrationPlugin.PLUGIN_ID, e.getMessage(), + // e); Status status = new Status(IStatus.ERROR, DeltaCloudIntegrationPlugin.PLUGIN_ID, e.getMessage(), e); ErrorDialog.openError(WorkbenchUtils.getActiveShell(), Messages.ERROR, @@ -197,7 +227,7 @@ } }); } - + public static IRemoteFileSubSystem findRemoteFileSubSystem(IHost host) { return CreateServerFromRSEJob.findRemoteFileSubSystem(host); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-10 16:37:03 UTC (rev 29103) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-10 16:58:07 UTC (rev 29104) @@ -12,7 +12,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; @@ -31,6 +30,9 @@ import org.osgi.service.prefs.Preferences; public class CreateRSEFromInstanceJob extends AbstractInstanceJob { + /** the timeout for trying to connect to the new instance */ + private static final long CONNECT_TIMEOUT = 3 * 60 * 1000; + private Job nextJob2 = null; public CreateRSEFromInstanceJob(DeltaCloudInstance instance, String family) { super("Create RSE Host from DeltaCloud Instance", instance, family); @@ -58,10 +60,8 @@ ((CreateServerFromRSEJob)nextJob2).setHost(host); } monitor.worked(10); - - SubProgressMonitor submon = new SubProgressMonitor(monitor, 90); - initialConnect(host); - return RSEUtils.connect(RSEUtils.getConnectorService(host), 90000, submon); + triggerCredentialsDialog(host, new SubProgressMonitor(monitor, 10)); + return RSEUtils.connect(RSEUtils.getConnectorService(host), CONNECT_TIMEOUT, new SubProgressMonitor(monitor, 80)); } catch (Exception e) { return ErrorUtils.handleError(Messages.ERROR, NLS.bind(Messages.COULD_NOT_LAUNCH_RSE_EXPLORER2, instance.getName()), @@ -71,12 +71,14 @@ return Status.OK_STATUS; } - private void initialConnect(IHost host) { + private void triggerCredentialsDialog(IHost host, IProgressMonitor monitor) { try { IRemoteFileSubSystem system = RSEUtils.findRemoteFileSubSystem(host); - system.connect(new NullProgressMonitor(), true); + system.connect(monitor, true /* force credentials dialog */); } catch(Exception e) { // ignore, expected, the server probably isn't up yet. + } finally { + monitor.done(); } }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29103 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-02-10 11:37:03 -0500 (Thu, 10 Feb 2011) New Revision: 29103 Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties Log: JBIDE-7989 Maven bot test plugin has no runnable tests Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties 2011-02-10 13:52:11 UTC (rev 29102) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/requirements.properties 2011-02-10 16:37:03 UTC (rev 29103) @@ -1 +1 @@ -requirements=jbossas-5.1.0.GA,seam-2.0.0.GA \ No newline at end of file +requirements=jbossas-5.1.0.GA,seam-2.2.0.GA \ No newline at end of file

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29102 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2011-02-10 08:52:11 -0500 (Thu, 10 Feb 2011) New Revision: 29102 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/FileRenameHelper.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/formattingbar/FormattingBarTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java Log: Fixes for JBDS 4.0.0.CR3 and Test Tuning Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -82,6 +82,7 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ editor.setText(editorText); editor.save(); + delay(); } super.tearDown(); } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -149,6 +149,11 @@ private static void hide(final Menu menu , boolean hideRecursively) { if (menu != null){ menu.notifyListeners(SWT.Hide, new Event()); + try { + Thread.sleep(50); + } catch (InterruptedException e) { + e.printStackTrace(); + } if (menu.getParentMenu() != null && hideRecursively) { hide(menu.getParentMenu(),hideRecursively); } @@ -538,6 +543,11 @@ menu.setVisible(false); } }); + try { + Thread.sleep(50); + } catch (InterruptedException e) { + e.printStackTrace(); + } } /** @@ -552,6 +562,11 @@ menu.setVisible(false); } }); + try { + Thread.sleep(50); + } catch (InterruptedException e) { + e.printStackTrace(); + } } /** Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/FileRenameHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/FileRenameHelper.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/FileRenameHelper.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -95,7 +95,7 @@ return "Renamed File " + newFileName + " was not found."; } // Editor Title was renamed - bot.sleep(Timing.time2S()); + bot.sleep(Timing.time5S()); try{ bot.editorByTitle(newFileName); }catch (WidgetNotFoundException wnfe) { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -35,6 +35,7 @@ import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest; +import org.jboss.tools.vpe.ui.bot.test.editor.tags.RichFacesTagsTest; import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test; import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest; import org.jboss.tools.vpe.ui.bot.test.palette.ImportTagsFromTLDFileTest; @@ -54,7 +55,10 @@ public class VPEAllBotTests extends SWTBotTestCase{ public static Test suite(){ TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$ - suite.addTestSuite(NewXHTMLPageWizardTest.class); + suite.addTestSuite(VisualEditorContextMenuTest.class); + suite.addTestSuite(EditingActionsTest.class); + suite.addTestSuite(NewXHTMLPageWizardTest.class); + suite.addTestSuite(ExternalizeStringsDialogTest.class); suite.addTestSuite(CancelTagLibDefenitionTest.class); suite.addTestSuite(ImportTagsFromTLDFileTest.class); suite.addTestSuite(ToggleCommentTest.class); @@ -76,15 +80,11 @@ suite.addTestSuite(RenameXHTMLFileTest.class); suite.addTestSuite(ImportUnknownTagsWizardTest.class); suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class); - suite.addTestSuite(ExternalizeStringsDialogTest.class); suite.addTestSuite(JspFileEditingTest.class); - suite.addTestSuite(XhtmlFilePerformanceTest.class); suite.addTestSuite(ManagePaletteGroupsTest.class); suite.addTestSuite(PaletteEditorTest.class); suite.addTestSuite(ToolbarTextFormattingTest.class); - suite.addTestSuite(VisualEditorContextMenuTest.class); suite.addTestSuite(InsertActionsTest.class); - suite.addTestSuite(EditingActionsTest.class); suite.addTestSuite(TextEditingActionsTest.class); suite.addTestSuite(PromptForTagAttributesDuringTagInsertTest.class); suite.addTestSuite(IncludedTagLibsTest.class); @@ -100,6 +100,8 @@ suite.addTestSuite(TextSelectionTest.class); suite.addTestSuite(CoreHTMLTagsTest.class); suite.addTestSuite(JSFTagsTest.class); + suite.addTestSuite(RichFacesTagsTest.class); + suite.addTestSuite(XhtmlFilePerformanceTest.class); return new TestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -148,10 +148,12 @@ */ private nsIDOMNode initJspPageBeforeInserting(String pageText , String nodeText) { + jspEditor.show(); jspEditor.setText(pageText); jspEditor.save(); botExt.sleep(Timing.time3S()); nsIDOMNode node = webBrowser.getDomNodeByTagName(nodeText, 0); + webBrowser.setFocus(); webBrowser.selectDomNode(node, 0); botExt.sleep(Timing.time1S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -63,12 +63,12 @@ final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(VisualEditorContextMenuTest.TEST_PAGE_NAME) .toTextEditor(); final SWTBotWebBrowser webBrowser = new SWTBotWebBrowser(VisualEditorContextMenuTest.TEST_PAGE_NAME,botExt); + checkEditMenuFunctionality(webBrowser, jspTextEditor); + checkInsertMenuFunctionality(webBrowser, jspTextEditor); checkContextMenuOfEmptyPage(webBrowser, jspTextEditor); checkContextMenuOfPlainText(webBrowser, jspTextEditor); checkContextMenuOfComponent(webBrowser, jspTextEditor); checkInsertMenuContent(webBrowser); - checkEditMenuFunctionality(webBrowser, jspTextEditor); - checkInsertMenuFunctionality(webBrowser, jspTextEditor); jspTextEditor.close(); } /** @@ -165,9 +165,8 @@ * @param expectedMenuLabels */ private void checkMenuContent(SWTBotWebBrowser webBrowser , String[] expectedMenuLabels){ - webBrowser.setFocus(); - bot.sleep(Timing.time1S()); + bot.sleep(Timing.time2S()); String[] menuLabels = ContextMenuHelper.getMenuItemLabels(webBrowser.getTopMenu(webBrowser.getSelectedDomNode(), SWTBotWebBrowser.INSERT_AROUND_MENU_LABEL)); assertMenuContent(menuLabels , expectedMenuLabels); @@ -416,15 +415,20 @@ * @param jspTextEditor */ private void checkEditMenuFunctionality(SWTBotWebBrowser webBrowser , SWTBotEclipseEditor jspTextEditor){ - jspTextEditor.setFocus(); - jspTextEditor.selectRange(6, 9, 0); + jspTextEditor.setText(VisualEditorContextMenuTest.PAGE_TEXT); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); webBrowser.setFocus(); + botExt.sleep(Timing.time5S()); // Test Cut nsIDOMNode calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); + botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(calendarNode,0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); webBrowser.clickContextMenu(calendarNode, IDELabel.Menu.CUT); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); String sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should not contain text '<rich:calendar></rich:calendar>'\nSource Editor Text: " + sourceEditorText, @@ -433,8 +437,11 @@ webBrowser.setFocus(); nsIDOMNode inputTextNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.selectDomNode(inputTextNode,0); + botExt.sleep(Timing.time2S()); webBrowser.clickContextMenu(inputTextNode, IDELabel.Menu.PASTE); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should contain text '<rich:calendar></rich:calendar>'\nSource Editor Text: " + sourceEditorText, @@ -442,14 +449,16 @@ // Test Copy calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.setFocus(); - calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.selectDomNode(calendarNode,0); + botExt.sleep(Timing.time2S()); webBrowser.clickContextMenu(calendarNode, IDELabel.Menu.COPY); + botExt.sleep(Timing.time2S()); inputTextNode = webBrowser.getDomNodeByTagName("INPUT",1); webBrowser.selectDomNode(inputTextNode,0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); webBrowser.clickContextMenu(inputTextNode, IDELabel.Menu.PASTE); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); + jspTextEditor.save(); sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should not contain text '<h:inputText/>'\nSource Editor Text: " + sourceEditorText, @@ -458,16 +467,18 @@ jspTextEditor.setFocus(); jspTextEditor.setText(VisualEditorContextMenuTest.PAGE_TEXT); jspTextEditor.save(); + bot.sleep(Timing.time2S()); jspTextEditor.selectRange(6, 9, 0); - bot.sleep(Timing.time1S()); + bot.sleep(Timing.time2S()); webBrowser.setFocus(); // Test Cut calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.selectDomNode(calendarNode,0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); webBrowser.setFocus(); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_X,KeyEvent.VK_CONTROL); - botExt.sleep(Timing.time1S()); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should not contain text '<rich:calendar></rich:calendar>'\nSource Editor Text: " + sourceEditorText, @@ -476,23 +487,29 @@ webBrowser.setFocus(); inputTextNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.selectDomNode(inputTextNode,0); + botExt.sleep(Timing.time2S()); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); - botExt.sleep(Timing.time1S()); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should contain text '<rich:calendar></rich:calendar>'\nSource Editor Text: " + sourceEditorText, sourceEditorText.contains("<rich:calendar></rich:calendar>")); // Test Copy - calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); webBrowser.setFocus(); + botExt.sleep(Timing.time2S()); calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); + botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(calendarNode,0); + botExt.sleep(Timing.time2S()); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_C,KeyEvent.VK_CONTROL); inputTextNode = webBrowser.getDomNodeByTagName("INPUT",1); + botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(inputTextNode,0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); - botExt.sleep(Timing.time1S()); + jspTextEditor.save(); + botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); assertTrue ("Source Editor should not contain text '<h:inputText/>'\nSource Editor Text: " + sourceEditorText, Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/formattingbar/FormattingBarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/formattingbar/FormattingBarTest.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/formattingbar/FormattingBarTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -37,124 +37,4 @@ botExt = new SWTBotExt(); } - public void testEditStyleButton() throws Throwable { - /* - * Open test page - */ - openPage(); - jspEditor = botExt.swtBotEditorExtByTitle(TEST_PAGE); - /* - * Set cursor to some html tag - */ - jspEditor.insertText(7, 6, ""); //$NON-NLS-1$ - bot.sleep(Timing.time2S()); - /* - * Style formatting should be disabled - */ - assertFalse("Style formatting should be disabled", bot //$NON-NLS-1$ - .toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE) - .isEnabled()); - /* - * Add some html text - */ - jspEditor.insertText(10, 0, DIV_TEXT); - /* - * Put the cursor - */ - jspEditor.insertText(10, 2, ""); //$NON-NLS-1$ - bot.sleep(Timing.time2S()); - /* - * Check the button - */ - assertTrue("Style formatting should be enabled", bot //$NON-NLS-1$ - .toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE) - .isEnabled()); - /* - * Open the dialog - */ - bot.toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE).click(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).setFocus(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).activate(); - /* - * Press OK with no changes - */ - assertTrue("(OK) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.OK_BUTTON).isEnabled()); - bot.button(WidgetVariables.OK_BUTTON).click(); - /* - * Check base style values - */ - jspEditor.insertText(10, 4, STYLE_TEXT); - jspEditor.insertText(10, 2, ""); //$NON-NLS-1$ - bot.sleep(Timing.time2S()); - /* - * Check the button - */ - assertTrue("Style formatting should be enabled", bot //$NON-NLS-1$ - .toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE) - .isEnabled()); - /* - * Open the dialog - */ - bot.toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE).click(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).setFocus(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).activate(); - /* - * Press OK with no changes - */ - assertTrue("(OK) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.OK_BUTTON).isEnabled()); - bot.button(WidgetVariables.OK_BUTTON).click(); - /* - * Check the updated style text - */ - jspEditor.selectRange(10, 4, 38); - assertEquals("Style string should be updated", STYLE_TEXT2, jspEditor.getSelection()); //$NON-NLS-1$ - /* - * Check the button - */ - assertTrue("Style formatting should be enabled", bot //$NON-NLS-1$ - .toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE) - .isEnabled()); - /* - * Open the dialog - */ - bot.toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE).click(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).setFocus(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).activate(); - bot.comboBoxWithLabel("font-size:").setText("20"); //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Press OK with no changes - */ - assertTrue("(OK) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.OK_BUTTON).isEnabled()); - bot.button(WidgetVariables.OK_BUTTON).click(); - /* - * Check the updated style text - */ - jspEditor.selectRange(10, 4, 37); - assertEquals("Style string should be updated", STYLE_TEXT3, jspEditor.getSelection()); //$NON-NLS-1$ - /* - * Check the button - */ - assertTrue("Style formatting should be enabled", bot //$NON-NLS-1$ - .toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE) - .isEnabled()); - /* - * Open the dialog - */ - bot.toolbarButtonWithTooltip(VpeUIMessages.EDIT_STYLE_ATTRIBUTE).click(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).setFocus(); - bot.shell(JstUIMessages.CSS_STYLE_EDITOR_TITLE).activate(); - bot.comboBoxWithLabel("font-size:").setText("8"); //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Press OK with no changes - */ - assertTrue("(Cancel) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.CANCEL_BUTTON).isEnabled()); - bot.button(WidgetVariables.CANCEL_BUTTON).click(); - jspEditor.selectRange(10, 4, 37); - assertEquals("Style string should be updated", STYLE_TEXT3, jspEditor.getSelection()); //$NON-NLS-1$ - } - } Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -0,0 +1,170 @@ +/******************************************************************************* + + * Copyright (c) 2007-2011 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.bot.test.editor.tags; + +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; +import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase; +import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser; +/** + * Tests Rich Faces Tags behavior + * @author vlado pakan + * + */ +public class RichFacesTagsTest extends VPEEditorTestCase { + + private static final String TEST_PAGE_NAME = "RichFacesTagsTest.jsp"; + + private SWTBotEditorExt jspEditor; + private SWTBotWebBrowser webBrowser; + private SWTBotExt botExt; + + public RichFacesTagsTest() { + super(); + botExt = new SWTBotExt(); + } + @Override + protected void setUp() throws Exception { + super.setUp(); + eclipse.maximizeActiveShell(); + createJspPage(RichFacesTagsTest.TEST_PAGE_NAME); + jspEditor = botExt.swtBotEditorExtByTitle(RichFacesTagsTest.TEST_PAGE_NAME); + webBrowser = new SWTBotWebBrowser(RichFacesTagsTest.TEST_PAGE_NAME,botExt); + } + + @Override + protected void closeUnuseDialogs() { + + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + @Override + protected void tearDown() throws Exception { + jspEditor.close(); + super.tearDown(); + } + /** + * Tests rich:comboBox Tag + */ + public void testComboBoxTag(){ + final String defaultLabel = "DefaultLabel"; + jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" + + "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" + + "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" + + "<html>\n" + + " <head>\n" + + " </head>\n" + + " <body>\n" + + " <f:view>\n" + + " <h:form>\n" + + " <rich:comboBox id=\"comboBox\" defaultLabel=\"" + defaultLabel + "\">\n" + + " <f:selectItem itemValue=\"item 1\"/>\n" + + " <f:selectItem itemValue=\"item 2\"/>\n" + + " </rich:comboBox>\n" + + " </h:form>\n" + + " </f:view>\n" + + " </body>\n" + + "</html>"); + jspEditor.save(); + bot.sleep(Timing.time3S()); + assertVisualEditorContains(webBrowser, + "INPUT", + new String[]{"type","class","value"}, + new String[]{"text","rich-combobox-font-disabled rich-combobox-input-inactive",defaultLabel}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertVisualEditorContains(webBrowser, + "INPUT", + new String[]{"type","class"}, + new String[]{"text","rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertVisualEditorContains(webBrowser, + "INPUT", + new String[]{"type","class"}, + new String[]{"text","rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive"}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertVisualEditorContains(webBrowser, + "DIV", + new String[]{"class"}, + new String[]{"rich-combobox-strut rich-combobox-font"}, + RichFacesTagsTest.TEST_PAGE_NAME); + // check tag selection + webBrowser.selectDomNode(webBrowser.getDomNodeByTagName("INPUT"), 0); + bot.sleep(Timing.time3S()); + String selectedText = jspEditor.getSelection(); + final String hasToStartWith = "<rich:comboBox"; + assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().startsWith(hasToStartWith)); + final String hasToEndWith = "</rich:comboBox>"; + assertTrue("Selected text in Source Pane has to end with '" + hasToEndWith + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().endsWith(hasToEndWith)); + + } + /** + * Tests rich:comboBox Tag + */ + public void testInplaceInputTag(){ + final String defaultLabel = "DefaultLabel"; + jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" + + "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" + + "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" + + "<html>\n" + + " <head>\n" + + " </head>\n" + + " <body>\n" + + " <f:view>\n" + + " <rich:inplaceInput defaultLabel=\"" + defaultLabel+ "\"/>\n" + + " </f:view>\n" + + " </body>\n" + + "</html>"); + jspEditor.save(); + bot.sleep(Timing.time3S()); + assertVisualEditorContains(webBrowser, + "SPAN", + new String[]{"vpe-user-toggle-id","title","class"}, + new String[]{"false","rich:inplaceInput defaultLabel: DefaultLabel","rich-inplace rich-inplace-view"}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertVisualEditorContainsNodeWithValue(webBrowser, + defaultLabel, + RichFacesTagsTest.TEST_PAGE_NAME); + // check tag selection + webBrowser.selectDomNode(webBrowser.getDomNodeByTagName("SPAN",2), 0); + bot.sleep(Timing.time3S()); + String selectedText = jspEditor.getSelection(); + final String expectedSelectedText = "<rich:inplaceInput defaultLabel=\"" + defaultLabel+ "\"/>"; + assertTrue("Selected text in Source Pane has to be '" + expectedSelectedText + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().equals(expectedSelectedText)); + webBrowser.mouseClickOnNode(webBrowser.getDomNodeByTagName("SPAN",2)); + bot.sleep(Timing.time3S()); + selectedText = jspEditor.getSelection(); + assertVisualEditorContains(webBrowser, + "SPAN", + new String[]{"vpe-user-toggle-id","class"}, + new String[]{"true","rich-inplace rich-inplace-edit"}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertVisualEditorContains(webBrowser, + "INPUT", + new String[]{"type","class","value"}, + new String[]{"text","rich-inplace-field",defaultLabel}, + RichFacesTagsTest.TEST_PAGE_NAME); + assertTrue("Selected text in Source Pane has to be '" + expectedSelectedText + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().equals(expectedSelectedText)); + + } +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -55,9 +55,11 @@ import org.jboss.tools.vpe.editor.mozilla.MozillaEventAdapter; import org.jboss.tools.vpe.ui.palette.PaletteAdapter; import org.jboss.tools.vpe.xulrunner.util.XPCOM; +import org.mozilla.interfaces.nsIDOMAbstractView; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMEvent; import org.mozilla.interfaces.nsIDOMEventTarget; +import org.mozilla.interfaces.nsIDOMMouseEvent; import org.mozilla.interfaces.nsIDOMNamedNodeMap; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; @@ -100,6 +102,9 @@ public static final String H_FORM_TAG_MENU_LABEL = "<h:form>"; public static final String RICH_CALENDAR_TAG_MENU_LABEL = "<rich:calendar>"; + private static final String MOUSE_CLICK_EVENT_TYPE="click"; //$NON-NLS-1$^M + private static final String CONTEXT_MENU_EVENT_TYPE="contextmenu"; //$NON-NLS-1$^M + private Display display; private IVisualEditor visualEditor; private MozillaEditor mozillaEditor; @@ -611,7 +616,7 @@ public void initEvent(String arg0, boolean arg1, boolean arg2) { } public String getType() { - return "contextmenu"; + return SWTBotWebBrowser.CONTEXT_MENU_EVENT_TYPE; } public double getTimeStamp() { return 0; @@ -639,6 +644,7 @@ getMozillaEventAdapter().handleEvent(domEvent); } }); + bot.sleep(Timing.time2S()); // Get Top Menu return UIThreadRunnable.syncExec(new WidgetResult<Menu>() { public Menu run() { @@ -791,4 +797,122 @@ protected static String stripTextFromSpecChars(String inputText){ return inputText.replaceAll("\n", " ").replaceAll("\t", "").trim(); } + + public void mouseClickOnNode(final nsIDOMNode node){ + // Create DOM Event + final nsIDOMMouseEvent domMouseEvent = new DomMouseEvent(node); + // Simulate Context Menu Event + display.syncExec(new Runnable() { + public void run() { + getMozillaEventAdapter().handleEvent(domMouseEvent); + } + }); + } + + private class DomMouseEvent implements nsIDOMMouseEvent { + private nsIDOMNode node = null; + public DomMouseEvent (nsIDOMNode node){ + this.node = node; + } + @Override + public int getDetail() { + return 0; + } + @Override + public nsIDOMAbstractView getView() { + return null; + } + @Override + public void initUIEvent(String arg0, boolean arg1, boolean arg2, + nsIDOMAbstractView arg3, int arg4) { + } + @Override + public boolean getBubbles() { + return false; + } + @Override + public boolean getCancelable() { + return false; + } + @Override + public nsIDOMEventTarget getCurrentTarget() { + return node != null ? XPCOM.queryInterface(node,nsIDOMEventTarget.class) : null; + } + @Override + public int getEventPhase() { + return 0; + } + @Override + public nsIDOMEventTarget getTarget() { + return node != null ? XPCOM.queryInterface(node,nsIDOMEventTarget.class) : null; + } + @Override + public double getTimeStamp() { + return 0; + } + @Override + public String getType() { + return SWTBotWebBrowser.MOUSE_CLICK_EVENT_TYPE; + } + @Override + public void initEvent(String arg0, boolean arg1, boolean arg2) { + } + @Override + public void preventDefault() { + } + @Override + public void stopPropagation() { + } + @Override + public nsIDOMMouseEvent queryInterface(String arg0) { + return this; + } + @Override + public boolean getAltKey() { + return false; + } + @Override + public int getButton() { + return 0; + } + @Override + public int getClientX() { + return 0; + } + @Override + public int getClientY() { + return 0; + } + @Override + public boolean getCtrlKey() { + return false; + } + @Override + public boolean getMetaKey() { + return false; + } + @Override + public nsIDOMEventTarget getRelatedTarget() { + return null; + } + @Override + public int getScreenX() { + return 0; + } + @Override + public int getScreenY() { + return 0; + } + @Override + public boolean getShiftKey() { + return false; + } + @Override + public void initMouseEvent(String arg0, boolean arg1, boolean arg2, + nsIDOMAbstractView arg3, int arg4, int arg5, int arg6, int arg7, + int arg8, boolean arg9, boolean arg10, boolean arg11, boolean arg12, + int arg13, nsIDOMEventTarget arg14) { + } + } + } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -910,10 +910,12 @@ * Select some text */ editor.navigateTo(pos); + bot.sleep(Timing.time1S()); /* * Send key press event to fire VPE listeners */ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT); + bot.sleep(Timing.time1S()); /* * Get toolbar button */ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2011-02-10 07:45:08 UTC (rev 29101) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2011-02-10 13:52:11 UTC (rev 29102) @@ -52,10 +52,21 @@ /* * Check table values */ - String taglib = bot.table().cell(0, 0); - assertEquals("Wrong table value.", "lib:tag", taglib); //$NON-NLS-1$ //$NON-NLS-2$ - taglib = bot.table().cell(1, 0); - assertEquals("Wrong table value.", "taglibName:tagName", taglib); //$NON-NLS-1$ //$NON-NLS-2$ + String firstLine = bot.table().cell(0, 0); + String libTagline = null; + String tagLibNameLine = null; + if (firstLine.startsWith("lib")){ + libTagline = firstLine; + tagLibNameLine = bot.table().cell(1, 0); + } + else{ + libTagline = bot.table().cell(1, 0); + tagLibNameLine = firstLine; + } + + assertEquals("Wrong table value.", "lib:tag", libTagline); //$NON-NLS-1$ //$NON-NLS-2$ + + assertEquals("Wrong table value.", "taglibName:tagName", tagLibNameLine); //$NON-NLS-1$ //$NON-NLS-2$ /* * Check that finish button is enabled and press it. */ @@ -76,11 +87,18 @@ /* * Check table values on the preferences page */ - String taglib00 = bot.table().cell(0, 0); - String taglib10 = bot.table().cell(1, 0); + firstLine = bot.table().cell(0, 0); + if (firstLine.startsWith("lib")){ + libTagline = firstLine; + tagLibNameLine = bot.table().cell(1, 0); + } + else{ + libTagline = bot.table().cell(1, 0); + tagLibNameLine = firstLine; + } bot.button(WidgetVariables.OK_BUTTON).click(); - assertEquals("Wrong table value.", "taglibName:tagName", taglib10); //$NON-NLS-1$ //$NON-NLS-2$ - assertEquals("Wrong table value.", "lib:tag", taglib00); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Wrong table value.", "taglibName:tagName", tagLibNameLine); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Wrong table value.", "lib:tag", libTagline); //$NON-NLS-1$ //$NON-NLS-2$ }

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29101 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/.settings and 18 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-02-10 02:45:08 -0500 (Thu, 10 Feb 2011) New Revision: 29101 Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/org.eclipse.jdt.core.prefs Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.core.prefs trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core.prefs trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.settings/org.eclipse.jdt.core.prefs trunk/cdi/plugins/org.jboss.tools.cdi.xml/.classpath trunk/cdi/plugins/org.jboss.tools.cdi.xml/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.classpath trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.core.prefs trunk/jst/plugins/org.jboss.tools.jst.jsp/.classpath trunk/jst/plugins/org.jboss.tools.jst.jsp/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/.classpath Log: https://issues.jboss.org/browse/JBIDE-8366 Changed the execution environment to JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <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 kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Mon Sep 14 23:19:30 MSD 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:40 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -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/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Fri Jun 11 14:44:26 MSD 2010 +#Thu Feb 10 10:42:41 MSK 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <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 kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Mon Sep 14 23:26:36 MSD 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/.classpath =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="resources/"/> - <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 kind="src" path="resources/"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Tue Oct 27 14:57:18 GMT+03:00 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="resources/"/> - <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 kind="src" path="resources/"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Tue Oct 27 14:57:18 GMT+03:00 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <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 kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Mon Sep 14 23:36:44 MSD 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:40 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <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.pde.core.requiredPlugins"/> - <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 kind="output" path="bin"/> +</classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -0,0 +1,8 @@ +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <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 kind="output" path="bin"/> +</classpath> Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -#Mon Sep 14 23:52:48 MSD 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/.classpath =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,8 +1,8 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="resources/"/> - <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 kind="src" path="resources/"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/.settings/org.eclipse.jdt.core.prefs 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -1 +1,9 @@ +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/.classpath 2011-02-10 01:14:27 UTC (rev 29100) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/.classpath 2011-02-10 07:45:08 UTC (rev 29101) @@ -1,7 +1,7 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <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 kind="output" path="bin"/> +</classpath> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/org.eclipse.jdt.core.prefs 2011-02-10 07:45:08 UTC (rev 29101) @@ -0,0 +1,8 @@ +#Thu Feb 10 10:42:41 MSK 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r29100 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: mcaspers Date: 2011-02-09 20:14:27 -0500 (Wed, 09 Feb 2011) New Revision: 29100 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml Log: fixed known issues Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-02-10 00:23:13 UTC (rev 29099) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-02-10 01:14:27 UTC (rev 29100) @@ -3,13 +3,13 @@  <articleinfo> - <title>4.0.0 Release Notes</title> -  +  + <title>Release Notes</title> <subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle> <productname>JBoss Developer Studio</productname> <productnumber>4.0</productnumber> <edition>0</edition> - <pubsnumber>13</pubsnumber> + <pubsnumber>15</pubsnumber> <abstract> <para> These release notes contain important information related to the JBoss Developer Studio. New features, resources, and other current issues are addressed here. Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml 2011-02-10 00:23:13 UTC (rev 29099) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues_4_0_0.xml 2011-02-10 01:14:27 UTC (rev 29100) @@ -17,7 +17,7 @@ </listitem> <listitem> <para> - <ulink url="https://issues.jboss.org/browse/JBRULES-2884">JBRULES-2884</ulink>: JavaDoc and source locations can not be specified for a Drools classpath container. + <ulink url="https://issues.jboss.org/browse/JBDS-1548">JBDS-1548</ulink>: JavaDoc and source locations can not be specified for a Drools classpath container. </para> </listitem> <listitem>

13 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2011