October 2011 - jbosstools-commits

JBoss Tools SVN: r35904 - trunk/download.jboss.org/jbosstools/examples.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-10-21 11:42:25 -0400 (Fri, 21 Oct 2011) New Revision: 35904 Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml Log: JBIDE-9774 : Switch multi-javaee6-archetype to jboss-javaee6-ear-webapp Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-21 15:41:40 UTC (rev 35903) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-21 15:42:25 UTC (rev 35904) @@ -311,7 +311,7 @@ <url/> <fixes> <fix type="wtpruntime"> - <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.60, org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.eap.60</property> + <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.eap.60</property> <property name="description">This project example requires JBoss AS 7.0</property> <property name="downloadId">org.jboss.tools.runtime.core.as.702</property> </fix>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35903 - trunk/download.jboss.org/jbosstools/examples.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-10-21 11:41:40 -0400 (Fri, 21 Oct 2011) New Revision: 35903 Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml Log: JBIDE-9774 : Switch multi-javaee6-archetype to jboss-javaee6-ear-webapp Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-21 15:21:40 UTC (rev 35902) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-21 15:41:40 UTC (rev 35903) @@ -305,8 +305,8 @@ <category>Java EE 6 Quickstarts</category> <name>multi-javaee6-archetype</name> <included-projects>multi-javaee6-archetype</included-projects> - <shortDescription>Java EE 6 Multi Module application(Maven archetype)</shortDescription> - <description>Experimental multi-module Java EE 6 project. It's composed of a parent pom project and 4 nested modules : Java Utility, EJB 3.1, Web 3.0 and EAR 6.0</description> + <shortDescription>JBoss AS 7 / Java EE 6 EAR Webapp(Maven archetype)</shortDescription> + <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7. The project is an EAR, with an EJB-JAR and WAR</description> <size>13806</size> <url/> <fixes> @@ -337,17 +337,14 @@ <importType>mavenArchetype</importType> <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration feature.</importTypeDescription> <mavenArchetype> - <archetypeGroupId>org.openarchetypes</archetypeGroupId> - <archetypeArtifactId>multi-javaee6-archetype</archetypeArtifactId> - <archetypeVersion>0.0.1-SNAPSHOT</archetypeVersion> - <archetypeRepository>http://open-archetypes.github.com/maven-repo/snapshots/</archetypeRepository> + <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId> + <archetypeArtifactId>jboss-javaee6-ear-webapp</archetypeArtifactId> + <archetypeVersion>7.1.0-SNAPSHOT</archetypeVersion> + <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository> <groupId>org.jboss.tools.example</groupId> - <artifactId>multi-javaee6</artifactId> + <artifactId>multi</artifactId> <version>0.0.1-SNAPSHOT</version> <javaPackage></javaPackage> - <properties> - <property name="name" value="Java EE 6 multi-module application"/> - </properties> </mavenArchetype>  </project>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35902 - workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2011-10-21 11:21:40 -0400 (Fri, 21 Oct 2011) New Revision: 35902 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/.classpath Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - .classpath for Linux x86 fix Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/.classpath =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/.classpath 2011-10-21 15:19:44 UTC (rev 35901) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/.classpath 2011-10-21 15:21:40 UTC (rev 35902) @@ -3,6 +3,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 combineaccessrules="false" kind="src" path="/org.eclipse.swt"/> <classpathentry kind="output" path="bin"/> </classpath>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35901 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2011-10-21 11:19:44 -0400 (Fri, 21 Oct 2011) New Revision: 35901 Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.classpath workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.project workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.jdt.core.prefs workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.pde.core.prefs workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/META-INF/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/build.properties workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/build.properties workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - MacOS X carbon version also works now Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/META-INF/MANIFEST.MF 2011-10-21 15:19:44 UTC (rev 35901) @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: BrowserSim -Bundle-SymbolicName: org.jboss.tools.browsersim +Bundle-SymbolicName: org.jboss.tools.browsersim;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.tools.browsersim.Activator -Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.eclipse.swt;bundle-version="3.7.0", - org.jboss.tools.browsersim.webkit;bundle-version="1.0.0" + org.jboss.tools.browsersim.webkit;bundle-version="1.0.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.ui;bundle-version="3.7.0" Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/build.properties =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/build.properties 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/build.properties 2011-10-21 15:19:44 UTC (rev 35901) @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/plugin.xml 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,10 @@ +<plugin> + <extension id="application" + point="org.eclipse.core.runtime.applications"> + <application> + <run + class="org.jboss.tools.browsersim.Application"> + </run> + </application> + </extension> +</plugin> Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Activator.java 2011-10-21 15:19:44 UTC (rev 35901) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.browsersim; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import org.eclipse.swt.widgets.Display; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -23,7 +27,7 @@ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ public void start(BundleContext context) throws Exception { - new BrowserSim().run(); + // new BrowserSim(new Display()).run(); } /* Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/Application.java 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim; + +import org.eclipse.equinox.app.IApplication; +import org.eclipse.equinox.app.IApplicationContext; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PlatformUI; + +/** + * @author Yahor Radtsevich (yradtsevich) + */ +public class Application implements IApplication { + + @Override + public Object start(IApplicationContext context) throws Exception { + Display display = PlatformUI.createDisplay(); + new BrowserSim(display).run(); + return IApplication.EXIT_OK; + } + + @Override + public void stop() { + // TODO Auto-generated method stub + + } + +} Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-10-21 15:19:44 UTC (rev 35901) @@ -57,12 +57,15 @@ private List<MenuItem> deviceMenuItems = new ArrayList<MenuItem>(); public static void main(String[] args) { - new BrowserSim().run(); + new BrowserSim(new Display()).run(); } + public BrowserSim(Display display) { + this.display = display; + } + @Override public void run() { - display = new Display(); shell = new Shell(display); GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 3; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/META-INF/MANIFEST.MF 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/META-INF/MANIFEST.MF 2011-10-21 15:19:44 UTC (rev 35901) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebKit -Bundle-SymbolicName: org.jboss.tools.browsersim.webkit +Bundle-SymbolicName: org.jboss.tools.browsersim.webkit;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-ExtensibleAPI: true Property changes on: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx ___________________________________________________________________ Added: svn:ignore + bin Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.classpath =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.classpath (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.classpath 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +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/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.project =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.project (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.project 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.browsersim.webkit.cocoa.macosx</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.jdt.core.prefs 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,8 @@ +#Fri Oct 21 14:36:30 EEST 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 Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.pde.core.prefs =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.pde.core.prefs (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/.settings/org.eclipse.pde.core.prefs 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,4 @@ +#Fri Oct 21 14:36:30 EEST 2011 +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/META-INF/MANIFEST.MF (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/META-INF/MANIFEST.MF 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: WebKit +Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.cocoa.macosx;singleton:=true +Bundle-Version: 1.0.0.qualifier +Fragment-Host: org.jboss.tools.browsersim.webkit;bundle-version="1.0.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) ) Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/build.properties =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/build.properties (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/build.properties 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.cocoa.macosx/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-21 15:19:44 UTC (rev 35901) @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.webkit; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.internal.cocoa.NSString; +import org.eclipse.swt.widgets.Composite; + +/** + * @author Yahor Radtsevich (yradtsevich) + */ +public class WebKitBrowser extends AbstractWebKitBrowser { + + public WebKitBrowser(Composite parent, int style) { + super(parent, style); + } + + protected void setCustomUserAgent(String userAgent) { + try { + Field webBrowserField = Browser.class.getDeclaredField("webBrowser"); + webBrowserField.setAccessible(true); + Object webKit = webBrowserField.get(this); + + Field webViewField = webKit.getClass().getDeclaredField("webView"); + webViewField.setAccessible(true); + Object webView = webViewField.get(webKit); + Method setCustomUserAgent = webView.getClass().getDeclaredMethod("setCustomUserAgent", NSString.class); + + if (userAgent == null) { + setCustomUserAgent.invoke(webView, null); + } else { + setCustomUserAgent.invoke(webView, NSString.stringWith(userAgent)); + } + } catch (SecurityException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } +} Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/META-INF/MANIFEST.MF 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/META-INF/MANIFEST.MF 2011-10-21 15:19:44 UTC (rev 35901) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebKit -Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.gtk.linux.x86 +Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.gtk.linux.x86;singleton:=true Bundle-Version: 1.0.0.qualifier Fragment-Host: org.jboss.tools.browsersim.webkit;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.gtk.linux.x86/src/org/jboss/tools/browsersim/webkit/WebKitBrowser.java 2011-10-21 15:19:44 UTC (rev 35901) @@ -53,11 +53,11 @@ Method webkit_web_view_get_settingsMethod = webKitGTKClass.getDeclaredMethod("webkit_web_view_get_settings", int.class); int settings = (Integer) webkit_web_view_get_settingsMethod.invoke(null, webView); - if (userAgent != null) { + if (userAgent == null) { + OS.g_object_set(settings, USER_AGENT, 0, 0); + } else { byte[] bytes = Converter.wcsToMbcs(null, userAgent, true); OS.g_object_set(settings, USER_AGENT, bytes, 0); - } else { - OS.g_object_set(settings, USER_AGENT, 0, 0); } } catch (SecurityException e) { e.printStackTrace(); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/META-INF/MANIFEST.MF =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/META-INF/MANIFEST.MF 2011-10-21 14:09:55 UTC (rev 35900) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit.win32.win32.x86/META-INF/MANIFEST.MF 2011-10-21 15:19:44 UTC (rev 35901) @@ -1,9 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebKit -Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.win32.win32.x86 +Bundle-SymbolicName: org.jboss.tools.browsersim.webkit.win32.win32.x86;singleton:=true Bundle-Version: 1.0.0.qualifier Fragment-Host: org.jboss.tools.browsersim.webkit;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.swt;bundle-version="3.7.0" Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35900 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2011-10-21 10:09:55 -0400 (Fri, 21 Oct 2011) New Revision: 35900 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java Log: Fixing JBIDE-9797 in trunk Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java 2011-10-21 13:27:56 UTC (rev 35899) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java 2011-10-21 14:09:55 UTC (rev 35900) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -97,14 +98,22 @@ } this.kind = nextKind; } - IMethodBinding methodBinding = JdtUtils.resolveMethodBinding(javaMethod, compilationUnit); + if (this.kind == EnumKind.SUBRESOURCE_LOCATOR) { + IMethodBinding methodBinding = JdtUtils.resolveMethodBinding( + javaMethod, compilationUnit); + ITypeBinding javaReturnTypeBinding = methodBinding.getReturnType(); + IJavaElement nextReturnType = javaReturnTypeBinding != null ? javaReturnTypeBinding + .getJavaElement() : null; - ITypeBinding javaReturnType = methodBinding.getReturnType(); - IType nextReturnType = javaReturnType != null ? (IType) javaReturnType.getJavaElement() : null; - if ((nextReturnType != null && !nextReturnType.equals(this.returnType)) - || (this.returnType != null && !this.returnType.equals(nextReturnType))) { - changes.add(EnumElementChange.KIND); - this.returnType = nextReturnType; + if (nextReturnType.getElementType() == IJavaElement.TYPE + && ((nextReturnType != null && !nextReturnType + .equals(this.returnType)) || (this.returnType != null && !this.returnType + .equals(nextReturnType)))) { + changes.add(EnumElementChange.KIND); + this.returnType = (IType) nextReturnType; + } + } else { + this.returnType = null; } return changes;

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35899 - branches/jbosstools-3.3.0.M4/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2011-10-21 09:27:56 -0400 (Fri, 21 Oct 2011) New Revision: 35899 Modified: branches/jbosstools-3.3.0.M4/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java Log: JBIDE-9797 fix jax-rs issues Modified: branches/jbosstools-3.3.0.M4/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java =================================================================== --- branches/jbosstools-3.3.0.M4/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java 2011-10-21 12:27:51 UTC (rev 35898) +++ branches/jbosstools-3.3.0.M4/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/ResourceMethod.java 2011-10-21 13:27:56 UTC (rev 35899) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -50,8 +51,10 @@ * @throws CoreException * @throws InvalidModelElementException */ - public ResourceMethod(final IMethod javaMethod, final Resource parentResource, final Metamodel metamodel, - final IProgressMonitor progressMonitor) throws InvalidModelElementException, CoreException { + public ResourceMethod(final IMethod javaMethod, + final Resource parentResource, final Metamodel metamodel, + final IProgressMonitor progressMonitor) + throws InvalidModelElementException, CoreException { super(javaMethod, metamodel); this.parentResource = parentResource; this.resourceMethodMapping = new ResourceMethodMapping(this); @@ -63,7 +66,8 @@ */ @Override // FIXME : always returning at least MAPPING ?? - public final Set<EnumElementChange> merge(final IMethod javaMethod, final IProgressMonitor progressMonitor) + public final Set<EnumElementChange> merge(final IMethod javaMethod, + final IProgressMonitor progressMonitor) throws InvalidModelElementException, CoreException { CompilationUnit compilationUnit = getCompilationUnit(progressMonitor); Set<EnumElementChange> changes = new HashSet<EnumElementChange>(); @@ -77,7 +81,8 @@ * metamodel.reportErrors(javaMethod, problems); return; } */ HTTPMethod httpMethod = resourceMethodMapping.getHTTPMethod(); - String uriPathTemplateFragment = resourceMethodMapping.getUriPathTemplateFragment(); + String uriPathTemplateFragment = resourceMethodMapping + .getUriPathTemplateFragment(); EnumKind nextKind = null; if (uriPathTemplateFragment == null && httpMethod != null) { nextKind = EnumKind.RESOURCE_METHOD; @@ -90,21 +95,30 @@ "ResourceMethod has no valid @Path annotation and no HTTP ResourceMethod annotation"); } if (this.kind != nextKind) { - if (this.kind == EnumKind.SUBRESOURCE_LOCATOR || nextKind == EnumKind.SUBRESOURCE_LOCATOR) { + if (this.kind == EnumKind.SUBRESOURCE_LOCATOR + || nextKind == EnumKind.SUBRESOURCE_LOCATOR) { changes.add(EnumElementChange.KIND); } else { changes.add(EnumElementChange.MAPPING); } this.kind = nextKind; } - IMethodBinding methodBinding = JdtUtils.resolveMethodBinding(javaMethod, compilationUnit); + if (this.kind == EnumKind.SUBRESOURCE_LOCATOR) { + IMethodBinding methodBinding = JdtUtils.resolveMethodBinding( + javaMethod, compilationUnit); + ITypeBinding javaReturnTypeBinding = methodBinding.getReturnType(); + IJavaElement nextReturnType = javaReturnTypeBinding != null ? javaReturnTypeBinding + .getJavaElement() : null; - ITypeBinding javaReturnType = methodBinding.getReturnType(); - IType nextReturnType = javaReturnType != null ? (IType) javaReturnType.getJavaElement() : null; - if ((nextReturnType != null && !nextReturnType.equals(this.returnType)) - || (this.returnType != null && !this.returnType.equals(nextReturnType))) { - changes.add(EnumElementChange.KIND); - this.returnType = nextReturnType; + if (nextReturnType.getElementType() == IJavaElement.TYPE + && ((nextReturnType != null && !nextReturnType + .equals(this.returnType)) || (this.returnType != null && !this.returnType + .equals(nextReturnType)))) { + changes.add(EnumElementChange.KIND); + this.returnType = (IType) nextReturnType; + } + } else { + this.returnType = null; } return changes; @@ -168,7 +182,8 @@ */ @Override public final String toString() { - return "ResourceMethod [" + parentResource.getName() + "." + getJavaElement().getElementName() + "] -> " + return "ResourceMethod [" + parentResource.getName() + "." + + getJavaElement().getElementName() + "] -> " + resourceMethodMapping.toString() + ", kind=" + kind + "]"; } @@ -190,7 +205,8 @@ @Override public boolean equals(Object obj) { if (obj instanceof ResourceMethod) { - return getJavaElement().equals(((ResourceMethod) obj).getJavaElement()); + return getJavaElement().equals( + ((ResourceMethod) obj).getJavaElement()); } return false; }

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35898 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: resources/cdi and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2011-10-21 08:27:51 -0400 (Fri, 21 Oct 2011) New Revision: 35898 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISmokeBotTests.launch trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean3.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean4.java.cdi Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/DisposerProducerBean.java.cdi trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/CDISeam3Test.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java Log: CDI OpenOn test correction + huge refactoring of all CDI tests Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISmokeBotTests.launch =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISmokeBotTests.launch (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CDISmokeBotTests.launch 2011-10-21 12:27:51 UTC (rev 35898) @@ -0,0 +1,53 @@ +<?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"/> +<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/> +<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS"> +<listEntry value="/org.jboss.tools.cdi.core/bin"/> +<listEntry value="/org.jboss.tools.cdi.solder.core/bin"/> +<listEntry value="/org.jboss.tools.cdi.text.ext/bin"/> +<listEntry value="/org.jboss.tools.cdi.xml/bin"/> +<listEntry value="/org.jboss.tools.cdi.xml.ui/bin"/> +<listEntry value="/org.jboss.tools.cdi.ui/bin"/> +</listAttribute> +<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.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.cdi.bot.test.CDISmokeBotTests"/> +<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.cdi.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/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/DisposerProducerBean.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/DisposerProducerBean.java.cdi 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/DisposerProducerBean.java.cdi 2011-10-21 12:27:51 UTC (rev 35898) @@ -4,12 +4,12 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; -public class Disposes1 { +public class DisposesProducerBean { @Inject MyBean mybean; - public Disposes1() { + public DisposesProducerBean() { } Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean3.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean3.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean3.java.cdi 2011-10-21 12:27:51 UTC (rev 35898) @@ -0,0 +1,16 @@ +package org.cdi.test; + +import javax.enterprise.event.Event; +import javax.inject.Inject; + +public class MyBean3 { + + public MyBean3() { + + } + + @Inject + @Q1 + Event<MyBean4> event; + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean4.java.cdi =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean4.java.cdi (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/MyBean4.java.cdi 2011-10-21 12:27:51 UTC (rev 35898) @@ -0,0 +1,15 @@ +package org.cdi.test; + +import javax.enterprise.event.Observes; + +public class MyBean4 { + + public MyBean4() { + + } + + public void observerMethod(@Observes MyBean4 bean) { + + } + +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -53,16 +53,15 @@ CDISeam3Test.class }) public class CDIAllBotTests extends CDIBase{ - - + /* * init method "setup()" shows a project explorer view as default, * disable folding (due to easier source code editing) */ @BeforeClass - public static void setUpSuite() { + public static void setUpSuite() { eclipse.showView(ViewType.PROJECT_EXPLORER); - CDIUtil.disableFolding(bot, util); + CDIUtil.disableFolding(bot, util); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -10,8 +10,12 @@ ******************************************************************************/ package org.jboss.tools.cdi.bot.test; +import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase; +import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil; import org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.jboss.tools.ui.bot.ext.types.ViewType; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -33,12 +37,21 @@ * * Suite duration: aprox. 12min * - * @author Lukas Jungmann * @author Jaroslav Jankovic */ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CdiATWizardTest.class, }) -public class CDISmokeBotTests { +public class CDISmokeBotTests extends CDIBase { + + /* + * init method "setup()" shows a project explorer view as default, + * disable folding (due to easier source code editing) + */ + @BeforeClass + public static void setUpSuite() { + eclipse.showView(ViewType.PROJECT_EXPLORER); + CDIUtil.disableFolding(bot, util); + } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -29,15 +29,16 @@ import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.jboss.tools.cdi.bot.test.CDIAllBotTests; +import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase; import org.jboss.tools.cdi.bot.test.uiutils.editor.BeansEditor; import org.jboss.tools.cdi.bot.test.uiutils.editor.BeansEditor.Item; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; -import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; import org.junit.After; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -51,23 +52,31 @@ /** * @author Lukas Jungmann + * @author jjankovi */ @Require(clearProjects = false, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) -public class BeansEditorTest extends SWTTestExt { +public class BeansEditorTest extends CDIBase { private static final String descPath = "WebContent/WEB-INF/beans.xml"; - private static final String project = "CDIProject1"; + private static final String project = "CDIProject"; + private static final String PACKAGE_NAME = "org.cdi.test"; private static final Logger LOGGER = Logger.getLogger(BeansEditorTest.class.getName()); @BeforeClass public static void prepare() { copyResource("resources/beans.xml", descPath); - copyResource("resources/Foo.jav_", "src/cdi/Foo.java"); - copyResource("resources/Bar.jav_", "src/cdi/Bar.java"); + copyResource("resources/Foo.jav_", "src/" + PACKAGE_NAME + "/Foo.java"); + copyResource("resources/Bar.jav_", "src/" + PACKAGE_NAME + "/Bar.java"); } + @AfterClass + public static void clean() { + removeObjectInProjectExplorer(PACKAGE_NAME, project + "/Java Resources/src"); + removeObjectInProjectExplorer("beans.xml", project + "/WebContent/WEB-INF"); + } + @Before public void setup() { new ProjectExplorer().openFile(project, descPath.split("/")); @@ -80,32 +89,32 @@ @Test public void testInterceptors() { - addItem(Item.INTERCEPTOR, "cdi.I1"); - removeItem(Item.INTERCEPTOR, "cdi.I1"); - addItem(Item.INTERCEPTOR, "cdi.I2"); + addItem(Item.INTERCEPTOR, PACKAGE_NAME + ".I1"); + removeItem(Item.INTERCEPTOR, PACKAGE_NAME + ".I1"); + addItem(Item.INTERCEPTOR, PACKAGE_NAME + ".I2"); } @Test public void testDecorators() { - addItem(Item.DECORATOR, "cdi.MapDecorator"); - addItem(Item.DECORATOR, "cdi.ComparableDecorator"); - removeItem(Item.DECORATOR, "cdi.ComparableDecorator"); + addItem(Item.DECORATOR, PACKAGE_NAME + ".MapDecorator"); + addItem(Item.DECORATOR, PACKAGE_NAME + ".ComparableDecorator"); + removeItem(Item.DECORATOR, PACKAGE_NAME + ".ComparableDecorator"); } @Test public void testClasses() { - addItem(Item.CLASS, "cdi.Foo"); - addItem(Item.CLASS, "cdi.Bar"); - removeItem(Item.CLASS, "cdi.Foo"); + addItem(Item.CLASS, PACKAGE_NAME + ".Foo"); + addItem(Item.CLASS, PACKAGE_NAME + ".Bar"); + removeItem(Item.CLASS, PACKAGE_NAME + ".Foo"); } @Test public void testStereotypes() { - addItem(Item.STEREOTYPE, "cdi.S2"); - addItem(Item.STEREOTYPE, "cdi.S3"); - removeItem(Item.STEREOTYPE, "cdi.S3"); - addItem(Item.STEREOTYPE, "cdi.S1"); - removeItem(Item.STEREOTYPE, "cdi.S2"); + addItem(Item.STEREOTYPE, PACKAGE_NAME + ".S2"); + addItem(Item.STEREOTYPE, PACKAGE_NAME + ".S3"); + removeItem(Item.STEREOTYPE, PACKAGE_NAME + ".S3"); + addItem(Item.STEREOTYPE, PACKAGE_NAME + ".S1"); + removeItem(Item.STEREOTYPE, PACKAGE_NAME + ".S2"); } @Test @@ -116,19 +125,19 @@ String text = be.toTextEditor().getText(); List<Node> nl = getItems(text, Item.INTERCEPTOR); assertEquals(1, nl.size()); - assertTrue(containsItem(nl, "cdi.I2")); + assertTrue(containsItem(nl, PACKAGE_NAME + ".I2")); nl = getItems(text, Item.DECORATOR); assertEquals(1, nl.size()); - assertTrue(containsItem(nl, "cdi.MapDecorator")); + assertTrue(containsItem(nl, PACKAGE_NAME + ".MapDecorator")); nl = getItems(text, Item.CLASS); assertEquals(1, nl.size()); - assertTrue(containsItem(nl, "cdi.Bar")); + assertTrue(containsItem(nl, PACKAGE_NAME + ".Bar")); nl = getItems(text, Item.STEREOTYPE); assertEquals(1, nl.size()); - assertTrue(containsItem(nl, "cdi.S1")); + assertTrue(containsItem(nl, PACKAGE_NAME + ".S1")); } private void addItem(Item item, String name) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/CDIOpenOnTest.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -21,11 +21,12 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.junit.After; +import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -/* +/** * Test operates on hyperlinks-openons using CDI tools * * @author Jaroslav Jankovic @@ -39,23 +40,31 @@ * */ -@Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) +@Require(clearProjects = false, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) public class CDIOpenOnTest extends CDIBase { private static final Logger LOGGER = Logger.getLogger(CDIQuickFixTest.class.getName()); - private static final String PROJECT_NAME = "CDIProject3"; + private static final String PROJECT_NAME = "CDIProject"; private static final String PACKAGE_NAME = "org.cdi.test"; @After public void waitForJobs() { util.waitForNonIgnoredJobs(); } - + + @AfterClass + public static void clean() { + removeObjectInProjectExplorer("beans.xml", PROJECT_NAME + "/WebContent/WEB-INF"); + } + @Test - public void testCreateProject() { - createAndCheckCDIProject(bot, util, projectExplorer, PROJECT_NAME); + public void testCheckProjectExists() { + if (!projectExists(PROJECT_NAME)) { + createAndCheckCDIProject(bot, util, projectExplorer,PROJECT_NAME); + } + assertTrue(projectExists(PROJECT_NAME)); } @Test @@ -136,27 +145,30 @@ assertTrue(getEd().toTextEditor().getSelection().equals("produceMethod")); openOn("produceMethod", testedBean + ".java", "Open Bound Disposer"); - assertTrue(getEd().toTextEditor().getSelection().equals("disposeMethod")); + assertTrue(getEd().toTextEditor().getSelection().equals("disposeMethod")); } - - + @Test public void testObserverOpenOn() { - /* - * not implemented yet - * - * Bean 1 - * @Inject - * @Qualifier1 - * Event<MyBean> event2; - * - * Bean 2 - * void myObserver(@Observes MyBean bean) { - * - * } - * - */ + createComponent(CDICOMPONENT.QUALIFIER, "Q1", PACKAGE_NAME, null); + createComponent(CDICOMPONENT.BEAN, "MyBean3", PACKAGE_NAME, null); + CDIUtil.copyResourceToClass(getEd(), CDIOpenOnTest.class + .getResourceAsStream("/resources/cdi/MyBean3.java.cdi"), + false); + createComponent(CDICOMPONENT.BEAN, "MyBean4", PACKAGE_NAME, null); + CDIUtil.copyResourceToClass(getEd(), CDIOpenOnTest.class + .getResourceAsStream("/resources/cdi/MyBean4.java.cdi"), + false); + bot.editorByTitle("MyBean3.java").show(); + setEd(bot.activeEditor().toTextEditor()); + CDIUtil.replaceInEditor(getEd(), bot, " event", " event"); + + openOn("observerMethod", "MyBean4.java", "Open CDI Events"); + assertTrue(getEd().toTextEditor().getSelection().equals("event")); + + openOn("Event<MyBean4> event", "MyBean3.java", "Open CDI Observer Methods"); + assertTrue(getEd().toTextEditor().getSelection().equals("observerMethod")); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -22,22 +22,23 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.view.ProblemsView; import org.junit.After; +import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -/* +/** * Test operates on quick fixes of CDI components validation * * @author Jaroslav Jankovic */ -@Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) +@Require(clearProjects = false, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) public class CDIQuickFixTest extends CDIBase { - private static final String PROJECT_NAME = "CDIProject2"; + private static final String PROJECT_NAME = "CDIProject"; private static final String PACKAGE_NAME = "org.cdi.test"; private static SWTBotTreeItem[] problemsTrees; private static final String LINE_SEPARATOR = System.getProperty("line.separator"); @@ -51,9 +52,17 @@ util.waitForNonIgnoredJobs(); } + @AfterClass + public static void clean() { + removeObjectInProjectExplorer(PACKAGE_NAME, PROJECT_NAME + "/Java Resources/src"); + } + @Test - public void testCreateProject() { - createAndCheckCDIProject(bot, util, projectExplorer,PROJECT_NAME); + public void testCheckProjectExists() { + if (!projectExists(PROJECT_NAME)) { + createAndCheckCDIProject(bot, util, projectExplorer,PROJECT_NAME); + } + assertTrue(projectExists(PROJECT_NAME)); } @Test Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/CDISeam3Test.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/CDISeam3Test.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/CDISeam3Test.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -15,37 +15,32 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.cdi.bot.test.CDIAllBotTests; import org.jboss.tools.cdi.bot.test.quickfix.CDIQuickFixTest; import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIBase; import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; -import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.helper.TreeHelper; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -/* +/** * Test operates on seam3 features using CDI tools * * @author Jaroslav Jankovic */ -@Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) +@Require(clearProjects = false, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) public class CDISeam3Test extends CDIBase { private static final Logger LOGGER = Logger.getLogger(CDISeam3Test.class.getName()); - private static final String PROJECT_NAME = "CDISeamProject"; + private static final String PROJECT_NAME = "CDIProject"; private static final String PACKAGE_NAME = "org.cdi.test"; private static final String GENERIC_PACKAGE_NAME = "org.cdi.generic"; @@ -56,7 +51,10 @@ @Test public void testCreateProjectWithSeamLibraries() { - createAndCheckCDIProject(bot, util, projectExplorer, PROJECT_NAME); + if (!projectExists(PROJECT_NAME)) { + createAndCheckCDIProject(bot, util, projectExplorer,PROJECT_NAME); + } + assertTrue(projectExists(PROJECT_NAME)); addLibrary("seam-solder.jar"); checkLibrary("seam-solder.jar"); } @@ -125,24 +123,6 @@ */ } - - private void moveFileInProjectExplorer(String file, String sourceFolder, String destFolder) { - SWTBotTree tree = projectExplorer.bot().tree(); - SWTBotTreeItem item = projectExplorer.selectTreeItem(file, sourceFolder.split("/")); - - CDIUtil.nodeContextMenu(tree, item, "Move...").click(); - - assertFalse(bot.button("OK").isEnabled()); - - tree = bot.tree(); - tree.collapseNode(destFolder.split("/")[0]); - - TreeHelper.expandNode(bot, destFolder.split("/")).select(); - - assertTrue(bot.button("OK").isEnabled()); - bot.button("OK").click(); - } - private void addLibrary(String libraryName) { try { addLibraryIntoProject(PROJECT_NAME, libraryName); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIBase.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -20,6 +20,7 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; @@ -34,6 +35,7 @@ import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.helper.TreeHelper; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; @@ -261,5 +263,46 @@ bot.button(IDELabel.Button.CANCEL).click(); bot.sleep(TIME_1S); } + + public void moveFileInProjectExplorer(String file, String sourceFolder, String destFolder) { + SWTBotTree tree = projectExplorer.bot().tree(); + SWTBotTreeItem item = projectExplorer.selectTreeItem(file, sourceFolder.split("/")); + + CDIUtil.nodeContextMenu(tree, item, "Move...").click(); + + assertFalse(bot.button("OK").isEnabled()); + + tree = bot.tree(); + tree.collapseNode(destFolder.split("/")[0]); + + TreeHelper.expandNode(bot, destFolder.split("/")).select(); + assertTrue(bot.button("OK").isEnabled()); + bot.button("OK").click(); + } + + public static void removeObjectInProjectExplorer(String object, String sourceFolder) { + SWTBotTree tree = projectExplorer.bot().tree(); + SWTBotTreeItem item = projectExplorer.selectTreeItem(object, sourceFolder.split("/")); + + CDIUtil.nodeContextMenu(tree, item, "Delete").click(); + + assertTrue(bot.button("OK").isEnabled()); + + bot.button("OK").click(); + + bot.sleep(TIME_1S*2); + } + + public boolean projectExists(String projectName) { + SWTBotTree tree = projectExplorer.bot().tree(); + boolean projectExists = false; + try { + tree.getTreeItem(projectName); + projectExists = true; + }catch (WidgetNotFoundException exc) { + } + return projectExists; + } + } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-10-21 12:12:17 UTC (rev 35897) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-10-21 12:27:51 UTC (rev 35898) @@ -30,19 +30,24 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; +/** + * @author Lukas Jungmann + * @author jjankovi + */ @Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class }) public class CdiATWizardTest extends CDIBase { - private static final String PROJECT_NAME = "CDIProject1"; + private static final String PROJECT_NAME = "CDIProject"; + private static final String PACKAGE_NAME = "org.cdi.test"; private static final Logger L = Logger.getLogger(CdiATWizardTest.class.getName()); @After public void waitForJobs() { util.waitForNonIgnoredJobs(); } - + @Test public void createProject() { createAndCheckCDIProject(bot, util, projectExplorer, PROJECT_NAME); @@ -50,7 +55,7 @@ @Test public void testQualifier() { - CDIUtil.qualifier("cdi", "Q1", false, false).finish(); + CDIUtil.qualifier(PACKAGE_NAME, "Q1", false, false).finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Q1.java").equals(ed.getTitle())); @@ -62,7 +67,7 @@ assertFalse(code.contains("@Inherited")); assertFalse(code.startsWith("/**")); - CDIUtil.qualifier("cdi", "Q2", true, true).finish(); + CDIUtil.qualifier(PACKAGE_NAME, "Q2", true, true).finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Q2.java").equals(ed.getTitle())); @@ -77,7 +82,7 @@ @Test public void testScope() { - CDIUtil.scope("cdi", "Scope1", true, false, true, false).finish(); + CDIUtil.scope(PACKAGE_NAME, "Scope1", true, false, true, false).finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Scope1.java").equals(ed.getTitle())); @@ -91,7 +96,7 @@ assertTrue(code.contains("@Inherited")); assertFalse(code.startsWith("/**")); - CDIUtil.scope("cdi", "Scope2", false, true, true, true).finish(); + CDIUtil.scope(PACKAGE_NAME, "Scope2", false, true, true, true).finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Scope2.java").equals(ed.getTitle())); @@ -104,7 +109,7 @@ assertFalse(code.contains("@Inherited")); assertTrue(code.startsWith("/**")); - CDIUtil.scope("cdi", "Scope3", false, true, false, false).finish(); + CDIUtil.scope(PACKAGE_NAME, "Scope3", false, true, false, false).finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Scope3.java").equals(ed.getTitle())); @@ -120,7 +125,7 @@ @Test public void testIBinding() { - CDIWizard w = CDIUtil.binding("cdi", "B1", null, true, false); + CDIWizard w = CDIUtil.binding(PACKAGE_NAME, "B1", null, true, false); assertEquals(2, w.getTargets().size()); w.finish(); util.waitForNonIgnoredJobs(); @@ -134,7 +139,7 @@ assertTrue(code.contains("@Inherited")); assertFalse(code.startsWith("/**")); - CDIUtil.binding("cdi", "B2", "TYPE", false, true).finish(); + CDIUtil.binding(PACKAGE_NAME, "B2", "TYPE", false, true).finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("B2.java").equals(ed.getTitle())); @@ -146,7 +151,7 @@ assertFalse(code.contains("@Inherited")); assertTrue(code.startsWith("/**")); - CDIUtil.binding("cdi", "B3", "TYPE", false, true).finish(); + CDIUtil.binding(PACKAGE_NAME, "B3", "TYPE", false, true).finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("B3.java").equals(ed.getTitle())); @@ -158,8 +163,8 @@ assertFalse(code.contains("@Inherited")); assertTrue(code.startsWith("/**")); - w = CDIUtil.binding("cdi", "B4", "TYPE", true, false); - w.addIBinding("cdi.B2"); + w = CDIUtil.binding(PACKAGE_NAME, "B4", "TYPE", true, false); + w.addIBinding(PACKAGE_NAME + ".B2"); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); @@ -176,7 +181,7 @@ @Test public void testStereotype() { - CDIWizard w = CDIUtil.stereotype("cdi", "S1", null, null, false, false, false, false, + CDIWizard w = CDIUtil.stereotype(PACKAGE_NAME, "S1", null, null, false, false, false, false, false); assertEquals(9, w.getScopes().size()); assertEquals(5, w.getTargets().size()); @@ -194,7 +199,7 @@ assertFalse(code.contains("@Inherited")); assertFalse(code.startsWith("/**")); - CDIUtil.stereotype("cdi", "S2", "@Scope3", "FIELD", true, true, true, false, true) + CDIUtil.stereotype(PACKAGE_NAME, "S2", "@Scope3", "FIELD", true, true, true, false, true) .finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); @@ -210,9 +215,9 @@ assertTrue(code.contains("@Target({ FIELD })")); assertTrue(code.startsWith("/**")); - w = CDIUtil.stereotype("cdi", "S3", null, null, false, false, true, false, false); - w.addIBinding("cdi.B1"); - w.addStereotype("cdi.S1"); + w = CDIUtil.stereotype(PACKAGE_NAME, "S3", null, null, false, false, true, false, false); + w.addIBinding(PACKAGE_NAME + ".B1"); + w.addStereotype(PACKAGE_NAME + ".S1"); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); @@ -233,7 +238,7 @@ @Test public void testDecorator() { - CDIWizard w = CDIUtil.decorator("cdi", "", "java.lang.Comparable", null, true, true, false, false); + CDIWizard w = CDIUtil.decorator(PACKAGE_NAME, "", "java.lang.Comparable", null, true, true, false, false); w.finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().editorByTitle("ComparableDecorator.java"); @@ -249,7 +254,7 @@ assertFalse(code.contains("final")); assertFalse(code.startsWith("/**")); - w = CDIUtil.decorator("cdi", "", "java.util.Map", "field", false, false, true, true); + w = CDIUtil.decorator(PACKAGE_NAME, "", "java.util.Map", "field", false, false, true, true); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().editorByTitle("MapDecorator.java"); @@ -268,7 +273,7 @@ @Test public void testInterceptor() { - CDIWizard w = CDIUtil.interceptor("cdi", "I1", "B2", null, null, false); + CDIWizard w = CDIUtil.interceptor(PACKAGE_NAME, "I1", "B2", null, null, false); w.finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().editorByTitle("I1.java"); @@ -282,7 +287,7 @@ assertFalse(code.contains("final")); assertFalse(code.startsWith("/**")); - w = CDIUtil.interceptor("cdi", "I2", "B4", "java.util.Date", "sample", true); + w = CDIUtil.interceptor(PACKAGE_NAME, "I2", "B4", "java.util.Date", "sample", true); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().editorByTitle("I2.java"); @@ -303,9 +308,9 @@ CDIWizard w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run(); w.setSourceFolder(PROJECT_NAME + "/WebContent/WEB-INF"); assertFalse(w.canFinish()); - w.setSourceFolder(PROJECT_NAME + "/src/cdi"); + w.setSourceFolder(PROJECT_NAME + "/src/" + PACKAGE_NAME.replaceAll(".", "/")); assertTrue(w.canFinish()); - w.finish(); + w.cancel(); w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run(); assertFalse(w.canFinish()); w.cancel(); @@ -313,41 +318,41 @@ @Test public void testBean() { - CDIWizard w = CDIUtil.bean("cdi", "Bean1", true, true, false, false, false, false, null, null, null, null); + CDIWizard w = CDIUtil.bean(PACKAGE_NAME, "Bean1", true, true, false, false, false, false, null, null, null, null); w.finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Bean1.java").equals(ed.getTitle())); String code = ed.toTextEditor().getText(); L.fine(code); - assertTrue(code.contains("package cdi;")); + assertTrue(code.contains("package org.cdi.test;")); assertTrue(code.contains("public abstract class Bean1 {")); assertFalse(code.contains("@Named")); assertFalse(code.contains("final")); assertFalse(code.startsWith("/**")); - w = CDIUtil.bean("cdi", "Bean2", false, false, true, true, false, false, "", null, "@Dependent", null); + w = CDIUtil.bean(PACKAGE_NAME, "Bean2", false, false, true, true, false, false, "", null, "@Dependent", null); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Bean2.java").equals(ed.getTitle())); code = ed.toTextEditor().getText(); L.fine(code); - assertTrue(code.contains("package cdi;")); + assertTrue(code.contains("package org.cdi.test;")); assertTrue(code.contains("@Named")); assertFalse(code.contains("@Named(")); assertTrue(code.contains("@Dependent")); assertTrue(code.contains("final class Bean2 {")); assertTrue(code.startsWith("/**")); - w = CDIUtil.bean("cdi", "Bean3", true, false, false, true, false, false, "TestedBean", null, "@Scope2", "Q1"); + w = CDIUtil.bean(PACKAGE_NAME, "Bean3", true, false, false, true, false, false, "TestedBean", null, "@Scope2", "Q1"); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("Bean3.java").equals(ed.getTitle())); code = ed.toTextEditor().getText(); L.fine(code); - assertTrue(code.contains("package cdi;")); + assertTrue(code.contains("package org.cdi.test;")); assertTrue(code.contains("@Named(\"TestedBean\")")); assertTrue(code.contains("@Scope2")); assertTrue(code.contains("@Q1")); @@ -358,27 +363,27 @@ @Test public void testAnnLiteral() { - CDIWizard w = CDIUtil.annLiteral("cdi", "AnnL1", true, false, true, false, "cdi.Q1"); + CDIWizard w = CDIUtil.annLiteral(PACKAGE_NAME, "AnnL1", true, false, true, false, PACKAGE_NAME + ".Q1"); w.finish(); util.waitForNonIgnoredJobs(); SWTBotEditor ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("AnnL1.java").equals(ed.getTitle())); String code = ed.toTextEditor().getText(); L.info(code); - assertTrue(code.contains("package cdi;")); + assertTrue(code.contains("package org.cdi.test;")); assertTrue(code.contains("public final class AnnL1 extends AnnotationLiteral<Q1> implements Q1")); assertTrue(code.contains("public static final Q1 INSTANCE = new AnnL1();")); assertFalse(code.contains("abstract")); assertFalse(code.startsWith("/**")); - w = CDIUtil.annLiteral("cdi", "AnnL2", false, true, false, true, "Q2"); + w = CDIUtil.annLiteral(PACKAGE_NAME, "AnnL2", false, true, false, true, "Q2"); w.finish(); util.waitForNonIgnoredJobs(); ed = new SWTWorkbenchBot().activeEditor(); assertTrue(("AnnL2.java").equals(ed.getTitle())); code = ed.toTextEditor().getText(); L.info(code); - assertTrue(code.contains("package cdi;")); + assertTrue(code.contains("package org.cdi.test;")); assertTrue(code.contains("abstract class AnnL2 extends AnnotationLiteral<Q2> implements Q2 {")); assertTrue(code.contains("public static final Q2 INSTANCE = new AnnL2();")); assertFalse(code.substring(code.indexOf("final") + 5).contains("final"));

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35897 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2011-10-21 08:12:17 -0400 (Fri, 21 Oct 2011) New Revision: 35897 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/CreateNewTemplateFromJSFProject.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java Log: Added test for JSF template created from JSF project and small fixes for JBT 3.2.2. testing. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-10-21 10:50:14 UTC (rev 35896) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -16,6 +16,7 @@ import org.jboss.tools.jsf.ui.bot.test.smoke.MarkersTest; import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest; import org.jboss.tools.jsf.ui.bot.test.smoke.WebXmlEditorTest; +import org.jboss.tools.jsf.ui.bot.test.templates.CreateNewTemplateFromJSFProject; import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest; import org.jboss.tools.jsf.ui.bot.test.templates.UnknownTemplateTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; @@ -46,7 +47,8 @@ CodeCompletionTest.class, FacesConfigCodeCompletionTest.class, MarkersTest.class, - WebXmlEditorTest.class + WebXmlEditorTest.class, + CreateNewTemplateFromJSFProject.class }) public class JSFAllBotTests{ } \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/CreateNewTemplateFromJSFProject.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/CreateNewTemplateFromJSFProject.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/CreateNewTemplateFromJSFProject.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -0,0 +1,90 @@ + /******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.jsf.ui.bot.test.templates; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.test.WidgetVariables; +/** + * Test creating new JSF project template from existing project + * @author Vladimir Pakan + * + */ +public class CreateNewTemplateFromJSFProject extends JSFAutoTestCase{ + + private static final String TEST_PAGE_NAME = "CreateNewTemplateFromJSFProject.jsp"; + private static final String TEMPLATE_NAME = "JsfTestTemplate"; + private static final String TEMPLATE_IMPLEMENTATION = "JSF 1.2"; + private static final String TEMPLATE_TEST_PROJECT_NAME = "newTemplateProject"; + + public void testCreateNewJSFProject() { + createJspPage(CreateNewTemplateFromJSFProject.TEST_PAGE_NAME); + openWebProjects(); + delay(); + SWTBot webProjects = bot.viewByTitle(WidgetVariables.WEB_PROJECTS).bot(); + SWTBotTree tree = webProjects.tree(); + + ContextMenuHelper.prepareTreeItemForContextMenu(tree, + tree.getTreeItem(JBT_TEST_PROJECT_NAME)); + + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, + IDELabel.Menu.WEB_PROJECT_JBT_JSF, false)).menu( + IDELabel.Menu.SAVE_AS_TEMPLATE).click(); + // create template + bot.shell(IDELabel.Shell.ADD_JSF_PROJECT_TEMPLATE).activate(); + bot.textWithLabel(IDELabel.AddJSFProjectTemplateDialog.NAME_TEXT_LABEL) + .setText(CreateNewTemplateFromJSFProject.TEMPLATE_NAME); + bot.comboBoxWithLabel(IDELabel.AddJSFProjectTemplateDialog.IMPLEMENTATION_COMBO_LABEL) + .setText(CreateNewTemplateFromJSFProject.TEMPLATE_IMPLEMENTATION); + bot.button(IDELabel.Button.FINISH).click(); + // create project using newly created template + SWTBot wiz = open + .newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL); + wiz.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL) + .setText(CreateNewTemplateFromJSFProject.TEMPLATE_TEST_PROJECT_NAME); + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL) + .setSelection(CreateNewTemplateFromJSFProject.TEMPLATE_IMPLEMENTATION); + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL) + .setSelection(CreateNewTemplateFromJSFProject.TEMPLATE_NAME); + wiz.button(IDELabel.Button.NEXT).click(); + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.RUNTIME_LABEL) + .setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$ + open.finish(wiz); + waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); + packageExplorer.selectProject(CreateNewTemplateFromJSFProject.TEMPLATE_TEST_PROJECT_NAME); + packageExplorer.bot().menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.REFRESH).click(); + bot.sleep(Timing.time3S()); + packageExplorer.selectTreeItem(CreateNewTemplateFromJSFProject.TEST_PAGE_NAME, + new String[]{CreateNewTemplateFromJSFProject.TEMPLATE_TEST_PROJECT_NAME, + "WebContent.pages"}).doubleClick(); + packageExplorer.deleteProject(CreateNewTemplateFromJSFProject.TEMPLATE_TEST_PROJECT_NAME, true); + + } + + @Override + protected void closeUnuseDialogs() { + // not used + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/CreateNewTemplateFromJSFProject.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2011-10-21 10:50:14 UTC (rev 35896) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -124,6 +124,11 @@ } } } + System.out.println(sb.toString()); + for (String item : list1){ + System.out.println("result.add(\"" + item.replaceAll("\"", "\\\"") + "\");"); + } + return sb.toString(); } 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 2011-10-21 10:50:14 UTC (rev 35896) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -83,6 +83,7 @@ public static final String PASTE = "Paste"; public static final String UNDO = "Undo"; public static final String CLOSE_ALL = "Close All"; + public static final String SAVE_AS_TEMPLATE = "Save As Template..."; } public class Button { @@ -164,6 +165,7 @@ public static final String ADD_SVN_REPOSITORY = "Add SVN Repository"; public static final String REPOSITORY_LOCATION_PROPERTIES = "Repository Location Properties"; public static final String SECURE_STORAGE = "Secure Storage"; + public static final String ADD_JSF_PROJECT_TEMPLATE = "Add JSF Project Template"; } public class EntityGroup { @@ -411,7 +413,7 @@ public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime"; public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x Runtime"; public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime"; - public static final String JBOSS_AS_6_0 = "JBoss 6.x Runtime"; + public static final String JBOSS_AS_6_0 = "JBoss 6.0 Runtime"; } public static final class ServerType { @@ -689,7 +691,7 @@ public static final String PROJECT_NAME_LABEL = "Project Name*"; public static final String JSF_ENVIRONMENT_LABEL = "JSF Environment*"; public static final String TEMPLATE_LABEL = "Template*"; - public static final String RUNTIME_LABEL = "Runtime*"; + public static final String RUNTIME_LABEL = "Runtime:*"; public static final String HOME_DIRECTORY_LABEL = "Home Directory"; } @@ -719,4 +721,9 @@ public static final String ADD_SERVLET_MAPPING_DIALOG_URL_PATTERN_LABEL = "URL-Pattern:*"; } + + public static class AddJSFProjectTemplateDialog{ + public static final String NAME_TEXT_LABEL = "Name:*"; + public static final String IMPLEMENTATION_COMBO_LABEL = "Implementation:*"; + } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-10-21 10:50:14 UTC (rev 35896) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -432,8 +432,7 @@ * @param projectName */ protected void openPage(String pageName, String projectName) { - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) - .bot(); + SWTBot innerBot = packageExplorer.show().bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(projectName).expandNode("WebContent") .expandNode("pages").getNode(pageName).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java 2011-10-21 10:50:14 UTC (rev 35896) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/selectionbar/SelectionBarTest.java 2011-10-21 12:12:17 UTC (rev 35897) @@ -84,6 +84,7 @@ * Send key press event to fire VPE listeners */ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT); + bot.sleep(Timing.time3S()); /* * Click on the tag in the selection bar */

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35896 - trunk/documentation/whatsnew.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2011-10-21 06:50:14 -0400 (Fri, 21 Oct 2011) New Revision: 35896 Modified: trunk/documentation/whatsnew/index.html Log: https://issues.jboss.org/browse/JBIDE-9966 , N&N for VPE for 3.3.0.M4 were added to index.html. Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2011-10-21 10:35:12 UTC (rev 35895) +++ trunk/documentation/whatsnew/index.html 2011-10-21 10:50:14 UTC (rev 35896) @@ -32,9 +32,15 @@ <hr> </td> </tr> - <tr> <td valign="top" align="left"> + 3.3.0.M4 + <td valign="top"> + <a href="vpe/vpe-news-3.3.0.M4.html">Visual Page Editor 3.3.0.M4</a> + </td> + </tr> + <tr> + <td valign="top" align="left"> 3.3.0.M3 <td valign="top">

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r35895 - trunk/jsf/docs/jsf_tools_tutorial.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2011-10-21 06:35:12 -0400 (Fri, 21 Oct 2011) New Revision: 35895 Removed: trunk/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial Log: remove broken docs content Deleted: trunk/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial =================================================================== --- trunk/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial 2011-10-21 10:14:25 UTC (rev 35894) +++ trunk/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial 2011-10-21 10:35:12 UTC (rev 35895) @@ -1 +0,0 @@ -link /shared/JBossToolsDocs/trunk/jsf/docs/jsf_tools_tutorial/ \ No newline at end of file

14 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2011