JBoss Tools SVN: r39967 - in trunk/gwt/tests: org.jboss.tools.gwt.tests and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-02 12:11:21 -0400 (Mon, 02 Apr 2012)
New Revision: 39967
Added:
trunk/gwt/tests/org.jboss.tools.gwt.tests/
trunk/gwt/tests/org.jboss.tools.gwt.tests/.classpath
trunk/gwt/tests/org.jboss.tools.gwt.tests/.project
trunk/gwt/tests/org.jboss.tools.gwt.tests/.settings/
trunk/gwt/tests/org.jboss.tools.gwt.tests/.settings/org.eclipse.jdt.core.prefs
trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/
trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF
trunk/gwt/tests/org.jboss.tools.gwt.tests/build.properties
trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/AllTests.java
trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/GWTTest.java
Modified:
trunk/gwt/tests/pom.xml
Log:
JBIDE-11370
Integrated tests in GWT
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/.classpath
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/.classpath (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/.classpath 2012-04-02 16:11:21 UTC (rev 39967)
@@ -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>
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/.project
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/.project (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/.project 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.gwt.tests</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>
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/.settings/org.eclipse.jdt.core.prefs 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,7 @@
+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/gwt/tests/org.jboss.tools.gwt.tests/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests for GWT integration
+Bundle-SymbolicName: org.jboss.tools.gwt.tests
+Bundle-Version: 1.0.2.qualifier
+Bundle-Vendor: JBoss by Red Hat
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit;bundle-version="4.8.2"
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/build.properties
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/build.properties (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/build.properties 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,13 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>gwt</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.gwt.tests</groupId>
+ <artifactId>org.jboss.tools.gwt.tests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+</project>
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/AllTests.java
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/AllTests.java (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/AllTests.java 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,13 @@
+package org.jboss.tools.gwt.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.runners.Suite.SuiteClasses;
+
+(a)RunWith(JUnit4.class)
+@SuiteClasses({
+ GWTTest.class
+})
+public class AllTests {
+
+}
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/AllTests.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/GWTTest.java
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/GWTTest.java (rev 0)
+++ trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/GWTTest.java 2012-04-02 16:11:21 UTC (rev 39967)
@@ -0,0 +1,13 @@
+package org.jboss.tools.gwt.tests;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class GWTTest {
+
+ @Test
+ public void test() {
+ fail("Not yet implemented");
+ }
+
+}
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.tests/src/org/jboss/tools/gwt/tests/GWTTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/gwt/tests/pom.xml
===================================================================
--- trunk/gwt/tests/pom.xml 2012-04-02 15:25:21 UTC (rev 39966)
+++ trunk/gwt/tests/pom.xml 2012-04-02 16:11:21 UTC (rev 39967)
@@ -13,6 +13,7 @@
<packaging>pom</packaging>
<modules>
+ <module>org.jboss.tools.gwt.tests</module>
</modules>
</project>
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39966 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/projects/jsf and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-04-02 11:25:21 -0400 (Mon, 02 Apr 2012)
New Revision: 39966
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-jsfapi-21/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-jsfapi-21/pom.xml
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
Log:
JBIDE-11416: fix JSF 2.1 dependencies ignored by JSFProjectConfigurator.
JSF Facet 2.1 now supported if run under Juno, otherwise, falls back on JSF Facet 2.0
https://issues.jboss.org/browse/JBIDE-11416
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-04-02 15:22:04 UTC (rev 39965)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-04-02 15:25:21 UTC (rev 39966)
@@ -12,7 +12,7 @@
import static org.jboss.tools.maven.jsf.configurators.JSFUtils.JSF_VERSION_1_1;
import static org.jboss.tools.maven.jsf.configurators.JSFUtils.JSF_VERSION_1_2;
-import static org.jboss.tools.maven.jsf.configurators.JSFUtils.JSF_VERSION_2_0;
+import static org.jboss.tools.maven.jsf.configurators.JSFUtils.*;
import java.util.List;
@@ -26,6 +26,7 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -67,6 +68,7 @@
private static final String WAR_SOURCE_FOLDER = "/src/main/webapp";
public static final IProjectFacet JSF_FACET;
+ public static final IProjectFacetVersion JSF_FACET_VERSION_2_1;
public static final IProjectFacetVersion JSF_FACET_VERSION_2_0;
public static final IProjectFacetVersion JSF_FACET_VERSION_1_2;
public static final IProjectFacetVersion JSF_FACET_VERSION_1_1;
@@ -78,6 +80,16 @@
JSF_FACET_VERSION_2_0 = JSF_FACET.getVersion(JSF_VERSION_2_0);
JSF_FACET_VERSION_1_2 = JSF_FACET.getVersion(JSF_VERSION_1_2); //$NON-NLS-1$
JSF_FACET_VERSION_1_1 = JSF_FACET.getVersion(JSF_VERSION_1_1); //$NON-NLS-1$
+
+ IProjectFacetVersion jsf21Version = null;
+ try {
+ jsf21Version = JSF_FACET.getVersion(JSF_VERSION_2_1);
+ } catch (Exception e) {
+ Activator.log("JSF 2.1 Facet is unavailable, fall back to 2.0");
+ jsf21Version = JSF_FACET_VERSION_2_0;
+ }
+ JSF_FACET_VERSION_2_1 = jsf21Version;
+
m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$
m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$
}
@@ -204,7 +216,10 @@
else if (jsfVersionString.startsWith(JSF_VERSION_2_0)) {
facetVersion = JSF_FACET_VERSION_2_0;
}
-
+ else if (jsfVersionString.startsWith(JSF_VERSION_2_1)) {
+ facetVersion = JSF_FACET_VERSION_2_1;
+ }
+
if (facetVersion != null) {
IStatus status = facetVersion.getConstraint().check(fproj.getProjectFacets());
if (status.isOK()) {
@@ -240,6 +255,7 @@
defaultFacesConfig.delete(true, monitor);
}
//JBIDE-11413 : don't create an unnecessary lib folder
+ libFolder.refreshLocal(IResource.DEPTH_ZERO, monitor);
if (!libFolderAlreadyExists
&& libFolder.exists()
&& libFolder.members().length == 0){
@@ -308,7 +324,7 @@
version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID);
}
if (version == null) {
- //Check if there's a JSF 2 dependency
+ //Check if there's a JSF 2.x dependency
version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID);
}
if (version == null) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-04-02 15:22:04 UTC (rev 39965)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFUtils.java 2012-04-02 15:25:21 UTC (rev 39966)
@@ -23,7 +23,9 @@
import org.codehaus.plexus.util.IOUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
@@ -41,6 +43,8 @@
private static final String FACES_SERVLET_XPATH = "//servlet[servlet-class=\"" + FACES_SERVLET + "\"]";
+ public static final String JSF_VERSION_2_1 = "2.1";
+
public static final String JSF_VERSION_2_0 = "2.0";
public static final String JSF_VERSION_1_2 = "1.2";
@@ -78,6 +82,7 @@
if (facesConfig != null) {
InputStream in = null;
try {
+ facesConfig.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());
in = facesConfig.getContents();
FacesConfigQuickPeek peek = new FacesConfigQuickPeek(in);
version = peek.getVersion();
@@ -134,7 +139,7 @@
* Determines the JSF version by searching for the methods of javax.faces.application.Application
* in the project's classpath.
* @param project : the java project to analyze
- * @return the JSF version (1.1, 1.2, 2.0) found in the classpath,
+ * @return the JSF version (1.1, 1.2, 2.0, 2.1) found in the classpath,
* or null if the project doesn't depend on JSF
*/
public static String getJSFVersionFromClasspath(IProject project) {
@@ -143,19 +148,20 @@
if (javaProject != null) {
IType type = null;
try {
- type = EclipseJavaUtil.findType(javaProject,
- "javax.faces.application.Application");//$NON-NLS-1$
+ type = EclipseJavaUtil.findType(javaProject, "javax.faces.context.FacesContext");//$NON-NLS-1$
} catch (JavaModelException e) {
e.printStackTrace();
}
if (type != null) {
String[] emptyParams = new String[0];
- if (type.getMethod("getResourceHandler", emptyParams).exists() &&
- type.getMethod("getProjectStage", emptyParams).exists()) {
+ if (type.getMethod("isReleased", emptyParams).exists()) {
+ return JSF_VERSION_2_1;
+ }
+ if (type.getMethod("getAttributes", emptyParams).exists() &&
+ type.getMethod("getPartialViewContext", emptyParams).exists()) {
return JSF_VERSION_2_0;
}
- if (type.getMethod("getELResolver", emptyParams).exists() &&
- type.getMethod("getExpressionFactory", emptyParams).exists()) {
+ if (type.getMethod("getELContext", emptyParams).exists()) {
return JSF_VERSION_1_2;
}
version = JSF_VERSION_1_1;
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-jsfapi-21/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-jsfapi-21/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-jsfapi-21/pom.xml 2012-04-02 15:25:21 UTC (rev 39966)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jsf-jsfapi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <!-- not in central, hence requires the JBoss repo -->
+ <artifactId>jsf-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2012-04-02 15:22:04 UTC (rev 39965)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2012-04-02 15:25:21 UTC (rev 39966)
@@ -1,5 +1,7 @@
package org.jboss.tools.maven.configurators.tests;
+import static org.jboss.tools.maven.jsf.configurators.JSFUtils.JSF_VERSION_2_1;
+
import java.io.File;
import org.eclipse.core.resources.IFile;
@@ -10,6 +12,7 @@
import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.tests.common.WorkspaceHelpers;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.maven.jsf.MavenJSFConstants;
import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
@@ -145,8 +148,6 @@
}
-
-
@Test
public void testJBIDE11413_WebInfLib() throws Exception {
IProject[] projects = importProjects("projects/jsf/JBIDE-11413", new String[]{ "jsf-nolib/pom.xml","jsf-lib/pom.xml"}, new ResolverConfiguration());
@@ -162,6 +163,24 @@
assertTrue("WEB-INF/lib was removed from the project!", lib.exists());
}
+ @Test
+ public void testJBIDE11416_supportJSF21Dependencies() throws Exception {
+ IProject project = importProject("projects/jsf/jsf-jsfapi-21/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertNoErrors(project);
+
+ boolean isJsf21available = false;
+ try {
+ isJsf21available = null != ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion(JSF_VERSION_2_1);
+ } catch (Exception e) {
+ //ignore
+ }
+
+ IProjectFacetVersion expectedJsfVersion = isJsf21available? JSFProjectConfigurator.JSF_FACET_VERSION_2_1
+ :JSFProjectConfigurator.JSF_FACET_VERSION_2_0;
+ assertIsJSFProject(project,expectedJsfVersion);
+ }
+
private void assertHasJSFConfigurationError(IProject project, String message) throws Exception {
WorkspaceHelpers.assertErrorMarker(MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID, message, 1, "", project);
}
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39965 - trunk/forge/tests.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-02 11:22:04 -0400 (Mon, 02 Apr 2012)
New Revision: 39965
Modified:
trunk/forge/tests/pom.xml
Log:
JBIDE-11142
JBIDE-11370
Re-enabled forge tests since disabling them make them useless (it's better to show a failing test than to disable it)
Modified: trunk/forge/tests/pom.xml
===================================================================
--- trunk/forge/tests/pom.xml 2012-04-02 12:37:12 UTC (rev 39964)
+++ trunk/forge/tests/pom.xml 2012-04-02 15:22:04 UTC (rev 39965)
@@ -11,44 +11,11 @@
<artifactId>tests</artifactId>
<name>forge.tests</name>
<packaging>pom</packaging>
- <profiles>
- <profile>
- <id>forge-tests-libs</id>
- <activation>
- <property>
- <name>forge-coverage</name>
- </property>
- </activation>
- <modules>
- <module>../../build/libs</module>
- </modules>
- </profile>
- <profile>
- <id>forge-tests-default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>forge-coverage</name>
- </property>
- </activation>
- <modules>
- <module>org.jboss.tools.forge.core.test</module>
- <module>org.jboss.tools.forge.ui.test</module>
- </modules>
- </profile>
-
- <profile>
- <id>forge-tests-coverage-report</id>
- <activation>
- <property>
- <name>forge-coverage</name>
- </property>
- </activation>
- <modules>
- <module>../../build/reports/emma-coverage</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>org.jboss.tools.forge.core.test</module>
+ <module>org.jboss.tools.forge.ui.bot.test</module>
+ <module>org.jboss.tools.forge.ui.test</module>
+ </modules>
</project>
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39964 - in trunk/central/tests/org.jboss.tools.central.test.ui.bot: src/org/jboss/tools/central/test/ui/bot and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-04-02 08:37:12 -0400 (Mon, 02 Apr 2012)
New Revision: 39964
Added:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithoutServerTest.java
Removed:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/DocumentationSectionTest.java
Log:
Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml (rev 0)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml 2012-04-02 12:37:12 UTC (rev 39964)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <profiles>
+
+ <!-- Configure the JBoss EAP Maven repository -->
+ <!-- this is recommend additional repository which comes with JBoss EAP 6 -->
+ <profile>
+ <id>jboss-eap-maven-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-eap</id>
+ <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER3-maven-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-eap-maven-plugin-repository</id>
+ <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER3-maven-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <profile>
+ <id>jboss-wfk-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-wfk-repository</id>
+ <name>JBoss WFK Maven Repository</name>
+ <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER3-maven-repository</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-wfk-repository-group</id>
+ <name>JBoss WFK Maven Repository</name>
+ <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER3-maven-repository</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ </profiles>
+
+ <activeProfiles>
+ <!-- Optionally, make the repository active by default -->
+ <activeProfile>jboss-eap-maven-repository</activeProfile>
+ <activeProfile>jboss-wfk-repository</activeProfile>
+ </activeProfiles>
+
+</settings>
\ No newline at end of file
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-04-02 08:41:23 UTC (rev 39963)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-04-02 12:37:12 UTC (rev 39964)
@@ -7,8 +7,9 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
//BaseFunctionalityTest.class,
- CreateProjectsTest.class
- //DocumentationSectionTest.class
+ CreateProjectsWithServerTest.class,
+ CreateProjectsWithoutServerTest.class,
+ DocumentationSectionTest.class
//EmptyTestForHudson.class
})
public class CentralAllBotTests {
Deleted: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java 2012-04-02 08:41:23 UTC (rev 39963)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java 2012-04-02 12:37:12 UTC (rev 39964)
@@ -1,194 +0,0 @@
-package org.jboss.tools.central.test.ui.bot;
-
-import java.io.File;
-
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
-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.ServerType;
-import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
-public class CreateProjectsTest extends SWTTestExt{
-
- private static final String JBOSS_INSTALL_PATH = "/tmp/jbossAS";
-
- @BeforeClass
- public static void setup(){
- log.info(configuredState.getServer().name);
- bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click();
- util.waitForAll();
- }
- @AfterClass
- public static void teardown(){
- deleteDirectory(new File(JBOSS_INSTALL_PATH));
- }
-
- //@Test
- public void createProjectsSectionTest(){
- //waitForAWhile();
- SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
- //Dynamic web project
- bot.hyperlink(IDELabel.JBossCentralEditor.DYNAMIC_WEB_PROJECT).click();
- bot.waitForShell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT);
- assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT).isActive());
- bot.activeShell().close();
- //Openshift app
- log.info(bot.activeShell().getText());
- bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click();
- bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD);
- //assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
- bot.activeShell().close();
-
- //check Project example and detection of server
-// formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
-// //bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
-// SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
-// assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
-// try{
-// bot.clickButton("Install");
-// SWTBotShell shell = bot.waitForShell(IDELabel.Menu.PREFERENCES);
-// if (shell == null){
-// fail("Preferences shell should have appeared");
-// }
-// bot.activeShell().close();
-// }catch(WidgetNotFoundException wnfex){
-// fail("Missing Install button");
-// }
-// try{
-// projectExampleShell.activate();
-// bot.clickButton("Download and Install...");
-// }catch(WidgetNotFoundException wnfex){
-// fail("Missing \"Download and Install\" button");
-// }
-//
-// //create direcotry where will be JBossAS downloaded
-// if(!createDirectory(JBOSS_INSTALL_PATH)){
-// fail("Unable to create direcory for JBoss - \""+JBOSS_INSTALL_PATH+"\"");
-// }
-//
-// bot.textWithLabel("Install folder:").setText(JBOSS_INSTALL_PATH);
-// bot.textWithLabel("Download folder:").setText("/tmp");
-// bot.clickButton("OK");
-// bot.waitForShell("Progress Information");
-// util.waitForNonIgnoredJobs(Long.MAX_VALUE);
-// //bot.waitUntil(Conditions.shellCloses(bot.activeShell()), Long.MAX_VALUE, TIME_5S);
-// projectExampleShell.close();
-
- //server should be added.. check again
- //formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
- bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
- SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
- assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
- try{
- bot.clickButton("Install");
- fail("Button \"Install\" should not be enabled, because all requirements should have been met");
- }catch(WidgetNotFoundException wnfex){
- //ok
- }
- projectExampleShell.activate();
- assertFalse("Button \"Download and Install...\" should not be enabled, because all requirements should have been met, condition", bot.button("Download and Install...").isEnabled());
-// bot.clickButton("Download and Install...");
-// fail("Button \"Download and Install...\" should not be enabled, because all requirements should have been met");
- projectExampleShell.close();
-
- //check the rest of project examples
- checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT);
- checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_PROJECT);
- checkCreateProject(IDELabel.JBossCentralEditor.HTML5_PROJECT);
- checkCreateProject(IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT);
- checkCreateProject(IDELabel.JBossCentralEditor.RICHFACES_PROJECT);
- bot.toolbarDropDownButtonWithTooltip("New").click();
- bot.waitForShell("New");
- assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());
- bot.activeShell().close();
- }
-
- @Test
- public void projectExamplesSectionTest(){
- SWTBotTwistie twistieBot = bot.twistieByLabel("JBoss Quickstarts");
- while (!twistieBot.isExpanded()){
- twistieBot.toggle();
- }
- /*if (!twistieBot.isExpanded()){
- twistieBot.toggle();
- }*/
- SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
- checkExample(formsBot, "Helloworld", true);
- checkExample(formsBot, "Numberguess", true);
- //checkExample(formsBot, "Login", false); //Login example ma nejaky divny login.xml cheatsheet
- //checkExample(formsBot, "Kitchensink", true); //zatim nejaka chyba v JBDS https://issues.jboss.org/browse/JBDS-2072
- checkExample(formsBot, "HTML5", true);
- }
-
- private void waitForAWhile(){
- bot.sleep(Long.MAX_VALUE);
- }
-
- private static boolean deleteDirectory(File path) {
- if( path.exists() ) {
- File[] files = path.listFiles();
- for(int i=0; i<files.length; i++) {
- if(files[i].isDirectory()) {
- deleteDirectory(files[i]);
- }
- else {
- files[i].delete();
- }
- }
- }
- return( path.delete() );
- }
-
- private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme){
- formsBot.formTextWithText(formText).click();
- bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
- SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
- wizard.next();
- wizard.finishWithWait();
- String readmeText = bot.checkBox(1).getText();
- assertFalse("Quick fix should not be enabled (Everything should be fine)", bot.checkBox(0).isEnabled());
- if (readme){
- assertTrue("Show readme checkbox should be enabled", bot.checkBox(1).isEnabled());
- assertTrue("Show readme checkbox should be checked by default", bot.checkBox(1).isChecked());
- if (readmeText.contains("cheatsheet.xml")){
- bot.clickButton("Finish");
- assertTrue("Cheat Sheets view should be open right now", bot.activeView().getTitle().equals("Cheat Sheets"));
- bot.activeView().close();
- }else if (readmeText.toLowerCase().contains("readme.md")){
- bot.clickButton("Finish");
- assertTrue("Readme should have opened in Text Editor", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.editors.text.TextEditor"));
- bot.activeEditor().close();
- }else if (readmeText.toLowerCase().contains("readme.htm")){
- bot.clickButton("Finish");
- assertTrue("Readme should have opened in Internal Browser", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.internal.browser.WebBrowserEditor"));
- }
- }
- }
-
- private void checkCreateProject(String formText){
- //formsBot.formTextWithText(formText).click();
- bot.hyperlink(formText).click();
- bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
- SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
- wizard.next();
- wizard.finishWithWait();
- bot.activeShell().close();
- if (bot.activeEditor().getTitle().equalsIgnoreCase("cheat sheets")){
- bot.activeEditor().close();
- }
-// assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
-// bot.button("Start").click();
-// bot.waitForShell(wizzardShellText);
-// assertTrue(wizzardShellText+" should have appeared", bot.shell(wizzardShellText).isActive());
-// bot.activeShell().close();
- }
-}
Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java (rev 0)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-02 12:37:12 UTC (rev 39964)
@@ -0,0 +1,221 @@
+package org.jboss.tools.central.test.ui.bot;
+
+import java.io.File;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
+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.ServerType;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
+public class CreateProjectsWithServerTest extends SWTTestExt{
+
+ @BeforeClass
+ public static void setup(){
+ bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click();
+ util.waitForAll();
+ }
+
+ @After
+ public void teardown(){
+ SWTBotTreeItem[] items = ProblemsView.getErrorsNode(bot).getItems();
+ for (SWTBotTreeItem swtBotTreeItem : items) {
+ log.error(swtBotTreeItem.toString());
+ }
+ }
+
+ @Test
+ public void createProjectsSectionTest(){
+ //waitForAWhile();
+ SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
+ //Dynamic web project
+ bot.hyperlink(IDELabel.JBossCentralEditor.DYNAMIC_WEB_PROJECT).click();
+ bot.waitForShell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT);
+ assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT).isActive());
+ bot.activeShell().close();
+ //Openshift app
+ log.info(bot.activeShell().getText());
+ bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click();
+ bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD);
+ //assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
+ bot.activeShell().close();
+
+ //check Project example and detection of server
+// formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+// //bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+// SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+// assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
+// try{
+// bot.clickButton("Install");
+// SWTBotShell shell = bot.waitForShell(IDELabel.Menu.PREFERENCES);
+// if (shell == null){
+// fail("Preferences shell should have appeared");
+// }
+// bot.activeShell().close();
+// }catch(WidgetNotFoundException wnfex){
+// fail("Missing Install button");
+// }
+// try{
+// projectExampleShell.activate();
+// bot.clickButton("Download and Install...");
+// }catch(WidgetNotFoundException wnfex){
+// fail("Missing \"Download and Install\" button");
+// }
+//
+// //create direcotry where will be JBossAS downloaded
+// if(!createDirectory(JBOSS_INSTALL_PATH)){
+// fail("Unable to create direcory for JBoss - \""+JBOSS_INSTALL_PATH+"\"");
+// }
+//
+// bot.textWithLabel("Install folder:").setText(JBOSS_INSTALL_PATH);
+// bot.textWithLabel("Download folder:").setText("/tmp");
+// bot.clickButton("OK");
+// bot.waitForShell("Progress Information");
+// util.waitForNonIgnoredJobs(Long.MAX_VALUE);
+// //bot.waitUntil(Conditions.shellCloses(bot.activeShell()), Long.MAX_VALUE, TIME_5S);
+// projectExampleShell.close();
+
+ //server should be added.. check again
+ //formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+ bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+ SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
+ try{
+ bot.clickButton("Install");
+ fail("Button \"Install\" should not be enabled, because all requirements should have been met");
+ }catch(WidgetNotFoundException wnfex){
+ //ok
+ }
+ projectExampleShell.activate();
+ assertFalse("Button \"Download and Install...\" should not be enabled, because all requirements should have been met, condition", bot.button("Download and Install...").isEnabled());
+// bot.clickButton("Download and Install...");
+// fail("Button \"Download and Install...\" should not be enabled, because all requirements should have been met");
+ projectExampleShell.close();
+
+ //check the rest of project examples
+ checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.HTML5_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, false);
+
+ /*checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT);
+ checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_PROJECT);
+ checkCreateProject(IDELabel.JBossCentralEditor.HTML5_PROJECT);
+ checkCreateProject(IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT);
+ checkCreateProject(IDELabel.JBossCentralEditor.RICHFACES_PROJECT);*/
+ bot.toolbarDropDownButtonWithTooltip("New").click();
+ bot.waitForShell("New");
+ assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());
+ bot.activeShell().close();
+ }
+
+ @Test
+ public void projectExamplesSectionTest(){
+ SWTBotTwistie twistieBot = bot.twistieByLabel("JBoss Quickstarts");
+ while (!twistieBot.isExpanded()){
+ twistieBot.toggle();
+ }
+ /*if (!twistieBot.isExpanded()){
+ twistieBot.toggle();
+ }*/
+ SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
+ checkExample(formsBot, "Helloworld", true);
+ checkExample(formsBot, "Numberguess", true);
+ checkExample(formsBot, "Login", true, "login.xml"); //Login example ma nejaky divny login.xml cheatsheet
+ checkExample(formsBot, "Kitchensink", true);
+ checkExample(formsBot, "HTML5", true);
+ }
+
+ private void waitForAWhile(){
+ bot.sleep(Long.MAX_VALUE);
+ }
+
+
+ /**
+ *
+ * @param formsBot formBot==null => link is of type HyperLink else it is of type FormText
+ * @param formText
+ * @param readme true if readme should be shown
+ */
+
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme){
+ checkExample(formsBot, formText, readme, null);
+ }
+
+ /**
+ * Checks example
+ * @param formsBot bot for Forms
+ * @param formText text to be clicked at
+ * @param readme true if readme is supposed to show, false otherwise
+ * @param readmeFileName
+ */
+
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme, String readmeFileName){
+ if (formsBot==null){
+ bot.hyperlink(formText).click();
+ }else{
+ formsBot.formTextWithText(formText).click();
+ }
+ bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
+ wizard.next();
+ if (wizard.canNext()) wizard.next();
+ wizard.finishWithWait();
+ String readmeText = bot.checkBox(1).getText();
+ assertFalse("Quick fix should not be enabled (Everything should be fine)", bot.checkBox(0).isEnabled());
+ if (readme){
+ assertTrue("Show readme checkbox should be enabled", bot.checkBox(1).isEnabled());
+ assertTrue("Show readme checkbox should be checked by default", bot.checkBox(1).isChecked());
+ if (readmeFileName != null){
+ assertTrue(readmeText.toLowerCase().contains(readmeFileName));
+ bot.clickButton("Finish");
+ assertTrue("Cheat Sheets view should be opened right now", bot.activeView().getTitle().equals("Cheat Sheets"));
+ bot.activeView().close();
+ }else if (readmeText.contains("cheatsheet.xml")){
+ bot.clickButton("Finish");
+ assertTrue("Cheat Sheets view should be opened right now", bot.activeView().getTitle().equals("Cheat Sheets"));
+ bot.activeView().close();
+ }else if (readmeText.toLowerCase().contains("readme.md") || readmeText.toLowerCase().contains("readme.txt")){
+ bot.clickButton("Finish");
+ //assertTrue("Readme should have opened in Text Editor", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.editors.text.TextEditor")); //because readmes are opening in browser now.. It's a bug. Jira is created.
+ bot.activeEditor().close();
+ }else if (readmeText.toLowerCase().contains("readme.htm")){
+ bot.clickButton("Finish");
+ assertTrue("Readme should have opened in Internal Browser", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.internal.browser.WebBrowserEditor"));
+ }
+ }else{
+ bot.clickButton("Finish");
+ }
+ }
+
+ private void checkCreateProject(String formText){
+ //formsBot.formTextWithText(formText).click();
+ bot.hyperlink(formText).click();
+ bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
+ wizard.next();
+ wizard.finishWithWait();
+ bot.activeShell().close();
+ if (bot.activeEditor().getTitle().equalsIgnoreCase("cheat sheets")){
+ bot.activeEditor().close();
+ }
+// assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
+// bot.button("Start").click();
+// bot.waitForShell(wizzardShellText);
+// assertTrue(wizzardShellText+" should have appeared", bot.shell(wizzardShellText).isActive());
+// bot.activeShell().close();
+ }
+}
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithoutServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithoutServerTest.java (rev 0)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithoutServerTest.java 2012-04-02 12:37:12 UTC (rev 39964)
@@ -0,0 +1,200 @@
+package org.jboss.tools.central.test.ui.bot;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.sql.Date;
+import java.util.Calendar;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.XMLMemento;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
+import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CreateProjectsWithoutServerTest extends SWTTestExt {
+
+ private static final String JBOSS_INSTALL_PATH = "/tmp/jbossAS";
+
+
+ @BeforeClass
+ public static void setup(){
+ bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click();
+ util.waitForAll();
+ }
+
+ @AfterClass
+ public static void teardown(){
+ deleteDirectory(new File(JBOSS_INSTALL_PATH));
+ }
+
+ @Test
+ public void createProjectsSectionTest(){
+ SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot();
+ //Dynamic web project
+ bot.hyperlink(IDELabel.JBossCentralEditor.DYNAMIC_WEB_PROJECT).click();
+ bot.waitForShell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT);
+ assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT).isActive());
+ bot.activeShell().close();
+ //Openshift app
+ bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click();
+ bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD);
+ bot.activeShell().close();
+
+ //check Project example and detection of server
+ bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+ SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
+ try{
+ bot.table().select(0);
+ bot.clickButton("Install...");
+ SWTBotShell shell = bot.waitForShell(IDELabel.Menu.PREFERENCES);
+ if (shell == null){
+ fail("Preferences shell should have appeared");
+ }
+ bot.activeShell().close();
+ }catch(WidgetNotFoundException wnfex){
+ fail("Missing Install button");
+ }
+ try{
+ projectExampleShell.activate();
+ bot.clickButton("Download and Install...");
+ }catch(WidgetNotFoundException wnfex){
+ fail("Missing \"Download and Install\" button");
+ }
+
+ //create direcotry where will be JBossAS downloaded
+ if(!createDirectory(JBOSS_INSTALL_PATH)){
+ fail("Unable to create direcory for JBoss - \""+JBOSS_INSTALL_PATH+"\"");
+ }
+
+ bot.textWithLabel("Install folder:").setText(JBOSS_INSTALL_PATH);
+ bot.textWithLabel("Download folder:").setText("/tmp");
+ bot.clickButton("OK");
+ bot.waitForShell("Progress Information");
+ //downloading jboss AS could take really long time, that's why waiting for shell twice.
+ try{
+ bot.waitUntil(new ShellIsActiveCondition(projectExampleShell), TaskDuration.VERY_LONG.getTimeout());
+ }catch(Exception ex){
+ //do nothing
+ }
+ bot.waitUntil(new ShellIsActiveCondition(projectExampleShell), TaskDuration.VERY_LONG.getTimeout());
+ projectExampleShell.close();
+
+ //server should be added.. check again
+ bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+ projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
+ try{
+ bot.clickButton("Install");
+ fail("Button \"Install\" should not be enabled, because all requirements should have been met");
+ }catch(WidgetNotFoundException wnfex){
+ //ok
+ }
+ projectExampleShell.activate();
+ assertFalse("Button \"Download and Install...\" should not be enabled, because all requirements should have been met, condition", bot.button("Download and Install...").isEnabled());
+ projectExampleShell.close();
+
+ //check the rest of project examples
+ checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.HTML5_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true);
+ checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, false);
+
+ bot.toolbarDropDownButtonWithTooltip("New").click();
+ bot.waitForShell("New");
+ assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive());
+ bot.activeShell().close();
+ }
+
+
+ /**
+ *
+ * @param formsBot formBot==null => link is of type HyperLink else it is of type FormText
+ * @param formText
+ * @param readme true if readme should be shown
+ */
+
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme){
+ checkExample(formsBot, formText, readme, null);
+ }
+
+ /**
+ * Checks example
+ * @param formsBot bot for Forms
+ * @param formText text to be clicked at
+ * @param readme true if readme is supposed to show, false otherwise
+ * @param readmeFileName
+ */
+
+ private void checkExample(SWTFormsBotExt formsBot, String formText, boolean readme, String readmeFileName){
+ if (formsBot==null){
+ bot.hyperlink(formText).click();
+ }else{
+ formsBot.formTextWithText(formText).click();
+ }
+ bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget);
+ wizard.next();
+ if (wizard.canNext()) wizard.next();
+ wizard.finishWithWait();
+ String readmeText = bot.checkBox(1).getText();
+ assertFalse("Quick fix should not be enabled (Everything should be fine)", bot.checkBox(0).isEnabled());
+ if (readme){
+ assertTrue("Show readme checkbox should be enabled", bot.checkBox(1).isEnabled());
+ assertTrue("Show readme checkbox should be checked by default", bot.checkBox(1).isChecked());
+ if (readmeFileName != null){
+ assertTrue(readmeText.toLowerCase().contains(readmeFileName));
+ bot.clickButton("Finish");
+ assertTrue("Cheat Sheets view should be opened right now", bot.activeView().getTitle().equals("Cheat Sheets"));
+ bot.activeView().close();
+ }else if (readmeText.contains("cheatsheet.xml")){
+ bot.clickButton("Finish");
+ assertTrue("Cheat Sheets view should be opened right now", bot.activeView().getTitle().equals("Cheat Sheets"));
+ bot.activeView().close();
+ }else if (readmeText.toLowerCase().contains("readme.md") || readmeText.toLowerCase().contains("readme.txt")){
+ bot.clickButton("Finish");
+ //assertTrue("Readme should have opened in Text Editor", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.editors.text.TextEditor")); //because readmes are opening in browser now.. It's a bug. Jira is created.
+ bot.activeEditor().close();
+ }else if (readmeText.toLowerCase().contains("readme.htm")){
+ bot.clickButton("Finish");
+ assertTrue("Readme should have opened in Internal Browser", bot.activeEditor().getReference().getEditor(false).getClass().getName().contains("org.eclipse.ui.internal.browser.WebBrowserEditor"));
+ }
+ }else{
+ bot.clickButton("Finish");
+ }
+ }
+
+
+ private boolean createDirectory(String path){
+ File file = new File(path);
+ return file.mkdir();
+ }
+
+ private static boolean deleteDirectory(File path) {
+ if( path.exists() ) {
+ File[] files = path.listFiles();
+ for(int i=0; i<files.length; i++) {
+ if(files[i].isDirectory()) {
+ deleteDirectory(files[i]);
+ }
+ else {
+ files[i].delete();
+ }
+ }
+ }
+ return( path.delete() );
+ }
+}
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithoutServerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/DocumentationSectionTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/DocumentationSectionTest.java 2012-04-02 08:41:23 UTC (rev 39963)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/DocumentationSectionTest.java 2012-04-02 12:37:12 UTC (rev 39964)
@@ -23,7 +23,7 @@
public void documentationSectionTest(){
testHyperlinkToBrowser("New and Noteworthy");
testHyperlinkToBrowser("User Forum");
- testHyperlinkToBrowser("Reference");
+ //testHyperlinkToBrowser("Reference");
testHyperlinkToBrowser("Developer Forum");
testHyperlinkToBrowser("FAQ");
testHyperlinkToBrowser("Wiki");
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39963 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-04-02 04:41:23 -0400 (Mon, 02 Apr 2012)
New Revision: 39963
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java
Log:
changed the task duration constants
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java 2012-04-02 04:07:05 UTC (rev 39962)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java 2012-04-02 08:41:23 UTC (rev 39963)
@@ -1,7 +1,7 @@
package org.jboss.tools.ui.bot.ext.condition;
public enum TaskDuration {
- SHORT(10 * 1000), NORMAL(30 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000);
+ SHORT(10 * 1000), NORMAL(60 * 1000), LONG(5 * 60 * 1000), VERY_LONG(10 * 60 * 1000);
private long timeout;
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39962 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-02 00:07:05 -0400 (Mon, 02 Apr 2012)
New Revision: 39962
Added:
tags/jbosstools-3.3.0.Beta2/
Log:
tag for Beta2
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39961 - trunk/download.jboss.org/jbosstools/updates/development/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-02 00:01:55 -0400 (Mon, 02 Apr 2012)
New Revision: 39961
Modified:
trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA...
trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC...
trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
Log:
release 3.3.0.Beta2 to http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2012-04-02 03:55:51 UTC (rev 39960)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2012-04-02 04:01:55 UTC (rev 39961)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1331662688000'/>
+<property name='p2.timestamp' value='1333338986000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2012-04-02 03:55:51 UTC (rev 39960)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2012-04-02 04:01:55 UTC (rev 39961)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1331662692000'/>
+<property name='p2.timestamp' value='1333338990000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/'/>
+<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2012-04-02 03:55:51 UTC (rev 39960)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2012-04-02 04:01:55 UTC (rev 39961)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Core - Development Milestone Update Site: 3.3.0.v20120308-1736-H123-Beta1</title>
+<title>JBoss Tools - Core - Development Milestone Update Site: 3.3.0.v20120328-1125-H136-Beta2</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,7 +24,7 @@
<h2 class="title">JBoss Tools - Core - Development Milestone Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20120308-1736-H123-Beta1</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20120328-1125-H136-Beta2</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -54,7 +54,7 @@
offline installation. See <a class="link"
href="http://www.jboss.org/tools/download">JBoss Tools
Downloads</a>.<br /> If you downloaded this site as a zip, see
- <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/...">Installation README</a>.
+ <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/...">Installation README</a>.
See also <a
href="http://www.jboss.org/tools/download/installation">Installation
methods</a>.
@@ -80,7 +80,7 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
<td><span style="font-size:x-small">3.2.1.v20120302-0154-H54-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -89,8 +89,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120308-1629-H87-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120321-1339-H91-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -98,7 +98,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
<td><span style="font-size:x-small">1.2.0.v20120302-0152-H55-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -107,14 +107,14 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
<td><span style="font-size:x-small">1.3.0.v20120302-0157-H58-Beta1</span></td>
<td><span style="font-size:x-small">
|
ReportTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
<td><span style="font-size:x-small">1.2.0.v20120302-0255-H54-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -125,7 +125,7 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
<td><span style="font-size:x-small">1.2.0.v20120302-0255-H54-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -136,12 +136,12 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.central.discovery.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.central.discovery.feature</a></td>
<td><span style="font-size:x-small">1.0.0.v20120307-1926-H67-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.central.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.central.feature</a></td>
<td><span style="font-size:x-small">1.0.0.v20120307-1926-H67-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -150,17 +150,17 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -169,7 +169,7 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.mylyn.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.mylyn.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -178,23 +178,23 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0132-H47-Beta1</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20120305-1726-H75-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.community.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20120320-2046-H78-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -202,8 +202,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20120307-0439-H54-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20120328-1255-H60-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -211,14 +211,14 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
<td><span style="font-size:x-small">1.0.2.v20120302-0200-H45-Beta1</span></td>
<td><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
<td><span style="font-size:x-small">1.2.0.v20120302-0157-H43-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -227,7 +227,7 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0331-H69-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -236,7 +236,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0221-H55-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -245,8 +245,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -254,8 +254,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -263,8 +263,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -272,8 +272,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -281,15 +281,15 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.jpa.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.jpa.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -297,8 +297,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -306,8 +306,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -315,8 +315,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.profiles.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.profiles.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -324,8 +324,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -333,8 +333,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20120307-0425-H80-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20120327-1922-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -342,8 +342,8 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120308-2230-H57-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120322-1632-H66-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -351,8 +351,8 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120308-2230-H57-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120322-1632-H66-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -360,7 +360,7 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
<td><span style="font-size:x-small">1.2.0.v20120302-2132-H56-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -369,8 +369,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.2.1.v20120305-1726-H75-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.2.1.v20120320-2046-H78-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -378,7 +378,7 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0331-H69-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -387,7 +387,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.runtime.as.detector.feature</a></td>
<td><span style="font-size:x-small">1.3.0.v20120307-2045-H73-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -396,14 +396,14 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
<td><span style="font-size:x-small">1.3.0.v20120307-2045-H73-Beta1</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.runtime.seam.detector.feature</a></td>
<td><span style="font-size:x-small">1.3.0.v20120307-2045-H73-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -412,7 +412,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-2019-H81-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -421,7 +421,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0304-H64-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -430,7 +430,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
<td><span style="font-size:x-small">1.1.0.v20120302-0148-H44-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -439,8 +439,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.vpe.browsersim.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20120308-0725-H60-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.vpe.browsersim.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20120322-2257-H61-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -448,7 +448,7 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
<td><span style="font-size:x-small">3.3.0.v20120302-0244-H56-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -457,8 +457,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20120306-1559-H77-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20120323-1522-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -466,8 +466,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20120306-1559-H77-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20120323-1522-H83-Beta2</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -475,8 +475,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20120308-0725-H60-Beta1</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20120322-2257-H61-Beta2</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -488,7 +488,7 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
<td><span style="font-size:x-small">3.4.0.v20120307-2104-H60-Beta1</span></td>
<td><span style="font-size:x-small">
|
@@ -501,8 +501,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">org.mozilla.xulrunner.feature</a></td>
- <td><span style="font-size:x-small">1.9.218.v20111123-2024-H140-M5</span></td>
+ <td class="rowLine"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">org.mozilla.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">1.9.218.v20120319-1950-H142-Beta3</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -511,19 +511,19 @@
<th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine" colspan="1"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">site.xml</a>
+ <td class="rowLine" colspan="1"><a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">site.xml</a>
::
- <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">artifacts.jar</a>
+ <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">artifacts.jar</a>
::
- <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">content.jar</a></td>
+ <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">content.jar</a></td>
<td class="rowLine" colspan="1">
::
- <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">plugins</a>
+ <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">plugins</a>
::
- <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">features</a></td>
+ <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">features</a></td>
<td class="rowLine" colspan="1">
- :: <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">jbosstools-directory.xml</a>
- :: <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta1.core/..." style="font-size:x-small">site.properties</a>
+ :: <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">jbosstools-directory.xml</a>
+ :: <a href="http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/..." style="font-size:x-small">site.properties</a>
</td>
</tr>
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39960 - trunk/download.jboss.org/jbosstools/updates/webtools/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-01 23:55:51 -0400 (Sun, 01 Apr 2012)
New Revision: 39960
Modified:
trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html
Log:
release 3.3.0.Beta2 to http://download.jboss.org/jbosstools/updates/webtools/indigo/
Modified: trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html 2012-04-02 03:39:22 UTC (rev 39959)
+++ trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html 2012-04-02 03:55:51 UTC (rev 39960)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Development Milestone Update Site: 3.3.0.v20120309-0041-H62-Beta1.webtools</title>
+<title>JBoss Tools - Web Tools - Development Milestone Update Site: 3.3.0.v20120323-1342-H63-Beta2.webtools</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,7 +24,7 @@
<h2 class="title">JBoss Tools - Web Tools - Development Milestone Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20120309-0041-H62-Beta1.webtools</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20120323-1342-H63-Beta2.webtools</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -80,8 +80,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120308-1629-H87-Beta1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120308-1629-H87-Beta1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120321-1339-H91-Beta2.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120321-1339-H91-Beta2</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39958 - in branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-01 17:27:36 -0400 (Sun, 01 Apr 2012)
New Revision: 39958
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
JBIDE-9936 - rename jboss 6.0 runtime to 6.x
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-04-01 18:04:31 UTC (rev 39957)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-04-01 21:27:36 UTC (rev 39958)
@@ -54,6 +54,9 @@
if( isEAP(getRuntime()) && version.equals(IConstants.V5_0))
version = "5.x"; //$NON-NLS-1$
+ if (version.equals(IConstants.V6_0) || version.equals(IConstants.V6_1)) {
+ version = "6.x"; //$NON-NLS-1$
+ }
if( getRuntime().getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.")) { //$NON-NLS-1$
base = Messages.jboss + " EAP " + version + " " + Messages.runtime; //$NON-NLS-1$ //$NON-NLS-2$
} else {
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2012-04-01 18:04:31 UTC (rev 39957)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2012-04-01 21:27:36 UTC (rev 39958)
@@ -24,9 +24,9 @@
jboss.version.51.description=JBoss Application Server 5.1
jboss.version.51.runtime.name=JBoss 5.1 Runtime
-jboss.version.60.name=JBoss AS 6.0
-jboss.version.60.description=JBoss Application Server 6.0
-jboss.version.60.runtime.name=JBoss 6.0 Runtime
+jboss.version.60.name=JBoss AS 6.x
+jboss.version.60.description=JBoss Application Server 6.x
+jboss.version.60.runtime.name=JBoss 6.x Runtime
jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
12 years, 1 month
- 1
- 0
JBoss Tools SVN: r39957 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-01 14:04:31 -0400 (Sun, 01 Apr 2012)
New Revision: 39957
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
Log:
JBIDE-11054 - Project Examples : Last wizard page popping up should have a "Don't show next time" checkbox
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -57,6 +57,7 @@
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -106,6 +107,7 @@
import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
import org.jboss.tools.project.examples.configurators.DefaultJBossCentralConfigurator;
import org.jboss.tools.project.examples.configurators.IJBossCentralConfigurator;
+import org.jboss.tools.project.examples.dialog.MarkerDialog;
import org.jboss.tools.project.examples.fixes.PluginFix;
import org.jboss.tools.project.examples.fixes.ProjectExamplesFix;
import org.jboss.tools.project.examples.fixes.SeamRuntimeFix;
@@ -154,7 +156,16 @@
public static final String PROJECT_EXAMPLES_OUTPUT_DIRECTORY = "projectExamplesOutputDirectory"; //$NON-NLS-1$
public static final String PROJECT_EXAMPLES_DEFAULT = "projectExamplesDefaultLocation"; //$NON-NLS-1$
public static final boolean PROJECT_EXAMPLES_DEFAULT_VALUE = true;
+
+ public static final String SHOW_PROJECT_READY_WIZARD = "showProjectRadyWizard"; //$NON-NLS-1$
+ public static final boolean SHOW_PROJECT_READY_WIZARD_VALUE = true;
+ public static final String SHOW_README = "showReadme"; //$NON-NLS-1$
+ public static final boolean SHOW_README_VALUE = true;
+
+ public static final String SHOW_QUICK_FIX = "showQuickFix"; //$NON-NLS-1$
+ public static final boolean SHOW_QUICK_FIX_VALUE = true;
+
private static final String IMPORT_PROJECT_EXAMPLES_EXTENSION_ID = "org.jboss.tools.project.examples.importProjectExamples"; //$NON-NLS-1$
private static final String NAME = "name"; //$NON-NLS-1$
private static final String TYPE = "type"; //$NON-NLS-1$
@@ -951,6 +962,31 @@
public static void showReadyWizard(final List<ProjectExample> projects) {
+ IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
+ boolean showProjectReadyWizard = store.getBoolean(SHOW_PROJECT_READY_WIZARD);
+ if (!showProjectReadyWizard) {
+ boolean openWelcome = store.getBoolean(SHOW_README);
+ if (openWelcome) {
+ ProjectExamplesActivator.openWelcome(projects);
+ }
+ boolean showQuickFix = store.getBoolean(SHOW_QUICK_FIX);
+ if (showQuickFix) {
+ List<IMarker> markers = getMarkers(projects);
+ if (markers != null && markers.size() > 0) {
+
+ Display.getCurrent().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ Dialog dialog = new MarkerDialog(Display.getCurrent().getActiveShell(), projects);
+ dialog.open();
+ }
+ });
+ }
+ }
+ return;
+ }
Display.getDefault().asyncExec(new Runnable() {
public void run() {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -62,6 +62,9 @@
private Button showInvalidSites;
private Text outputDirectoryText;
private Button isWorkspace;
+ private Button showProjectReadyWizard;
+ private Button showReadme;
+ private Button showQuickFix;
@Override
protected Control createContents(Composite parent) {
@@ -126,6 +129,18 @@
});
+ showProjectReadyWizard = new Button(composite,SWT.CHECK);
+ showProjectReadyWizard.setText("Show Project Ready wizard");
+ showProjectReadyWizard.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD));
+
+ showReadme = new Button(composite,SWT.CHECK);
+ showReadme.setText("Show readme/cheatsheet file");
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
+
+ showQuickFix = new Button(composite,SWT.CHECK);
+ showQuickFix.setText("Show Quick Fix dialog");
+ showQuickFix.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_QUICK_FIX));
+
showExperimentalSites = new Button(composite,SWT.CHECK);
showExperimentalSites.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites);
showExperimentalSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES));
@@ -261,6 +276,10 @@
@Override
protected void performDefaults() {
+ showProjectReadyWizard.setSelection(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD_VALUE);
+ showReadme.setSelection(ProjectExamplesActivator.SHOW_README_VALUE);
+ showQuickFix.setSelection(ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE);
+
showExperimentalSites.setSelection(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES_VALUE);
showInvalidSites.setSelection(ProjectExamplesActivator.SHOW_INVALID_SITES_VALUE);
isWorkspace.setSelection(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE);
@@ -278,6 +297,10 @@
private void storePreferences() {
IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+ store.setValue(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD, showProjectReadyWizard.getSelection());
+ store.setValue(ProjectExamplesActivator.SHOW_README, showReadme.getSelection());
+ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection());
+
store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, showExperimentalSites.getSelection());
store.setValue(ProjectExamplesActivator.SHOW_INVALID_SITES, showInvalidSites.getSelection());
store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT, isWorkspace.getSelection());
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -26,7 +26,7 @@
@Override
public void initializeDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode("org.jboss.tools.project.examples"); //$NON-NLS-1$
+ IEclipsePreferences node = DefaultScope.INSTANCE.getNode("org.jboss.tools.project.examples"); //$NON-NLS-1$
node.putBoolean(
ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES,
@@ -38,6 +38,15 @@
node.putBoolean(
ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT,
ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD,
+ ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_README,
+ ProjectExamplesActivator.SHOW_README_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_QUICK_FIX,
+ ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE);
}
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -4,10 +4,13 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -33,7 +36,7 @@
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout(1,false));
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
composite.setLayoutData(gd);
Dialog.applyDialogFont(composite);
setControl(composite);
@@ -52,27 +55,80 @@
showReadme.setSelection(false);
showReadme.setEnabled(false);
+ final Button showMe = new Button(composite, SWT.CHECK);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd.verticalAlignment = SWT.BOTTOM;
+ showMe.setLayoutData(gd);
+ showMe.setText("Do not show this page again");
+ final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
+ showMe.setSelection(!store.getBoolean(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD));
+
+ showMe.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD, !showMe.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+
if (projectExamples != null && projectExamples.size() > 0) {
configure(projectExamples);
}
setPageComplete(true);
+
+ if (showReadme.isEnabled()) {
+ showReadme.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_README, showReadme.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ }
+ if (showQuickFix.isEnabled()) {
+ showQuickFix.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ }
}
public void configure(List<ProjectExample> projectExamples) {
ProjectExample projectExample = projectExamples.get(0);
+ IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
if (projectExample != null) {
setTitle(projectExample.getShortDescription());
setDescription("'" + projectExample.getShortDescription() + "' Project is now ready");
if (showReadme != null) {
if (projectExample.isWelcome()) {
showReadme.setEnabled(true);
- showReadme.setSelection(true);
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
String urlString = projectExample.getWelcomeURL();
String welcomeURL = ProjectExamplesActivator.replace(urlString, projectExample);
showReadme.setText("Show '" + welcomeURL + "' for further instructions");
} else {
showReadme.setEnabled(false);
- showReadme.setSelection(false);
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
showReadme.setText(SHOW_README_FILE_FOR_FURTHER_INSTRUCTIONS);
}
}
@@ -80,7 +136,7 @@
.getMarkers(projectExamples);
if (markers != null && markers.size() > 0) {
showQuickFix.setEnabled(true);
- showQuickFix.setSelection(true);
+ showQuickFix.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_QUICK_FIX));
}
}
}
12 years, 1 month
- 1
- 0