August 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r33655 - in trunk/maven/tests/org.jboss.tools.maven.configurators.tests: projects and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-08-07 18:33:08 -0400 (Sun, 07 Aug 2011) New Revision: 33655 Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/pom.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/good-web.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/web.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF Log: JBIDE-9290 : added test for JAXRS configuration errors Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2011-08-07 21:55:24 UTC (rev 33654) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2011-08-07 22:33:08 UTC (rev 33655) @@ -14,6 +14,7 @@ org.jboss.tools.maven.jsf, org.jboss.tools.maven.portlet, org.jboss.tools.maven.seam, + org.jboss.tools.maven.jaxrs, org.jboss.tools.maven.ui, org.eclipse.wst.server.core, org.jboss.tools.common, Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/pom.xml 2011-08-07 22:33:08 UTC (rev 33655) @@ -0,0 +1,15 @@ +<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>jaxrs-error</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>1.7-ea05</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/good-web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/good-web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/good-web.xml 2011-08-07 22:33:08 UTC (rev 33655) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> +  + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-error/src/main/webapp/WEB-INF/web.xml 2011-08-07 22:33:08 UTC (rev 33655) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> +<web-app id="WebApp_ID"> + <display-name>jaxrs-error</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java 2011-08-07 22:33:08 UTC (rev 33655) @@ -0,0 +1,68 @@ +package org.jboss.tools.maven.configurators.tests; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jst.common.project.facet.core.JavaFacet; +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.jaxrs.configurators.JaxrsProjectConfigurator; +import org.jboss.tools.maven.jaxrs.configurators.MavenJaxRsConstants; +import org.junit.Test; + +@SuppressWarnings("restriction") +public class JaxRsConfiguratorTest extends AbstractMavenConfiguratorTest { + + /*@Test + public void testJBIDE9290_supportMultipleJaxRsDependencies() throws Exception { + IProject[] projects = importProjects("projects/jaxrs/", + new String[]{ + "jaxrs-jersey/pom.xml", + "jaxrs-resteasy/pom.xml" + }, + new ResolverConfiguration()); + waitForJobsToComplete(new NullProgressMonitor()); + IProject jersey = projects[0]; + assertNoErrors(jersey); + assertIsJaxRsProject(jersey, JaxrsProjectConfigurator.JAX_RS_FACET_1_1); + + IProject resteasy = projects[1]; + assertNoErrors(resteasy); + assertIsJaxRsProject(resteasy, JaxrsProjectConfigurator.JAX_RS_FACET_1_1); + + } + */ + + + @Test + public void testJBIDE9290_errorMarkers() throws Exception { + String projectLocation = "projects/jaxrs/jaxrs-error"; + IProject jaxRsProject = importProject(projectLocation+"/pom.xml"); + waitForJobsToComplete(new NullProgressMonitor()); + IFacetedProject facetedProject = ProjectFacetsManager.create(jaxRsProject); + assertNotNull(jaxRsProject.getName() + " is not a faceted project", facetedProject); + assertFalse("JAX-RS Facet should be missing", facetedProject.hasProjectFacet(JaxrsProjectConfigurator.JAX_RS_FACET)); + assertHasJaxRsConfigurationError(jaxRsProject, "JAX-RS (REST Web Services) 1.1 can not be installed : One or more constraints have not been satisfied."); + assertHasJaxRsConfigurationError(jaxRsProject, "JAX-RS (REST Web Services) 1.1 requires Dynamic Web Module 2.3 or newer."); + + //Check markers are removed upon configuration update + copyContent(jaxRsProject, "src/main/webapp/WEB-INF/good-web.xml", "src/main/webapp/WEB-INF/web.xml", true); + updateProject(jaxRsProject); + assertNoErrors(jaxRsProject); + assertIsJaxRsProject(jaxRsProject, JaxrsProjectConfigurator.JAX_RS_FACET_1_1); + } + + private void assertHasJaxRsConfigurationError(IProject project, String message) throws Exception { + WorkspaceHelpers.assertErrorMarker(MavenJaxRsConstants.JAXRS_CONFIGURATION_ERROR_MARKER_ID, message, 1, "", project); + } + + private void assertIsJaxRsProject(IProject project, + IProjectFacetVersion expectedJaxRsVersion) throws Exception { + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + assertNotNull(project.getName() + " is not a faceted project", facetedProject); + assertEquals("Unexpected JAX-RS Version", expectedJaxRsVersion, facetedProject.getInstalledVersion(JaxrsProjectConfigurator.JAX_RS_FACET)); + assertTrue("Java Facet is missing", facetedProject.hasProjectFacet(JavaFacet.FACET)); + } +}

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33654 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-08-07 17:55:24 -0400 (Sun, 07 Aug 2011) New Revision: 33654 Modified: trunk/build/aggregate/site/site.xml Log: JBIDE-9290 Added the new maven / jaxrs integration feature to the aggregate site.xml Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2011-08-07 21:41:55 UTC (rev 33653) +++ trunk/build/aggregate/site/site.xml 2011-08-07 21:55:24 UTC (rev 33654) @@ -115,6 +115,9 @@ <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0"> <category name="MavenTools" /> </feature> + <feature url="features/org.jboss.tools.maven.jaxrs.feature_0.0.0.jar" id="org.jboss.tools.maven.jaxrs.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> <feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0"> <category name="MavenTools" /> </feature>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33653 - trunk/download.jboss.org/jbosstools/updates/development/helios.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-07 17:41:55 -0400 (Sun, 07 Aug 2011) New Revision: 33653 Modified: trunk/download.jboss.org/jbosstools/updates/development/helios/compositeA... trunk/download.jboss.org/jbosstools/updates/development/helios/compositeC... trunk/download.jboss.org/jbosstools/updates/development/helios/index.html Log: copy from stable/helios/ into development/helios/ Modified: trunk/download.jboss.org/jbosstools/updates/development/helios/compositeA... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/helios/compositeA... 2011-08-07 21:41:41 UTC (rev 33652) +++ trunk/download.jboss.org/jbosstools/updates/development/helios/compositeA... 2011-08-07 21:41:55 UTC (rev 33653) @@ -1,13 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> <?compositeArtifactRepository version='1.0.0'?> -<repository name='JBoss Tools Development Milestone Update Site' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> +<repository name='JBoss Tools 3.2 - Stable Release' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/>  -<property name='p2.timestamp' value='1297978007000'/> +<property name='p2.timestamp' value='1312751566000'/> </properties> <children size='1'> <child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.1.Final/'/> Modified: trunk/download.jboss.org/jbosstools/updates/development/helios/compositeC... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/helios/compositeC... 2011-08-07 21:41:41 UTC (rev 33652) +++ trunk/download.jboss.org/jbosstools/updates/development/helios/compositeC... 2011-08-07 21:41:55 UTC (rev 33653) @@ -1,13 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> <?compositeMetadataRepository version='1.0.0'?> -<repository name='JBoss Tools Development Milestone Update Site' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> +<repository name='JBoss Tools 3.2 - Stable Release' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/>  -<property name='p2.timestamp' value='1297978007000'/> +<property name='p2.timestamp' value='1312751562000'/> </properties> <children size='1'> <child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.1.Final/'/> Modified: trunk/download.jboss.org/jbosstools/updates/development/helios/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/helios/index.html 2011-08-07 21:41:41 UTC (rev 33652) +++ trunk/download.jboss.org/jbosstools/updates/development/helios/index.html 2011-08-07 21:41:55 UTC (rev 33653) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools Development Milestone Update Site: 3.2.1.Final.2011-08-01_12-53-33-H1305</title> +<title>JBoss Tools Stable Release Update Site: 3.2.1.Final.2011-08-01_12-53-33-H1305</title> <style> @import url("../web/site.css"); </style> @@ -18,7 +18,7 @@ <tr> <td>  </td> <td> - <h2 class="title">JBoss Tools Development Milestone Update Site</h2> + <h2 class="title">JBoss Tools Stable Release Update Site</h2> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span>Latest Build: 3.2.1.Final.2011-08-01_12-53-33-H1305</span></td> @@ -26,7 +26,7 @@ <tr class="light-row" style="height: 30px"> <td class="bodyText"> - <p class="bodyText">This is the <b>Development Milestone</b> + <p class="bodyText">This is the <b>Stable Release</b> Update Site for JBoss Tools. See <a class="link" href="http://www.jboss.org/tools/download/update">Installation Instructions</a>.</p>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33652 - trunk/download.jboss.org/jbosstools/updates/stable/helios.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-07 17:41:41 -0400 (Sun, 07 Aug 2011) New Revision: 33652 Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeArtifa... trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeConten... trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html Log: release 3.2.1.Final to updates/stable/helios/ Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeArtifa... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeArtifa... 2011-08-07 21:41:26 UTC (rev 33651) +++ trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeArtifa... 2011-08-07 21:41:41 UTC (rev 33652) @@ -7,10 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1303420171000'/> +<property name='p2.timestamp' value='1312751566000'/> </properties> -<children size='2'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.0.GA/'/> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.0.GA-Teiid-De...'/> +<children size='1'> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.1.Final/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeConten... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeConten... 2011-08-07 21:41:26 UTC (rev 33651) +++ trunk/download.jboss.org/jbosstools/updates/stable/helios/compositeConten... 2011-08-07 21:41:41 UTC (rev 33652) @@ -7,10 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1303420171000'/> +<property name='p2.timestamp' value='1312751562000'/> </properties> -<children size='2'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.0.GA/'/> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.0.GA-Teiid-De...'/> +<children size='1'> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.2.1.Final/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-08-07 21:41:26 UTC (rev 33651) +++ trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-08-07 21:41:41 UTC (rev 33652) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools Stable Release Update Site: 3.2.0.GA 2011-02-16_18-30-44-H329</title> +<title>JBoss Tools Stable Release Update Site: 3.2.1.Final.2011-08-01_12-53-33-H1305</title> <style> @import url("../web/site.css"); </style> @@ -21,7 +21,7 @@ <h2 class="title">JBoss Tools Stable Release Update Site</h2> <table width="100%"> <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.GA 2011-02-16_18-30-44-H329</span></td> + <td class="sub-header" width="100%"><span>Latest Build: 3.2.1.Final.2011-08-01_12-53-33-H1305</span></td> </tr> <tr class="light-row" style="height: 30px"> @@ -37,15 +37,11 @@ <td class="bodyText"> <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>  -Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following update sites, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. +Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. </p> <ul> - <li><a href="http://download.eclipse.org//birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse 0.10 Extras</a></li> - <li><a href="http://subclipse.tigris.org/update_1.6.x"/>Subclipse 1.6 Update Site </a></li> - <li><a href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/helios/">JBoss Tools Requirements - Composite Mirror - Helios</a></li> </ul> </td> </tr>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33651 - trunk/build/aggregate/soa-site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-07 17:41:26 -0400 (Sun, 07 Aug 2011) New Revision: 33651 Modified: trunk/build/aggregate/soa-site/pom.xml Log: refactor artifactId and fix indigo reqs site URL to include SR0 suffix Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-08-07 21:37:29 UTC (rev 33650) +++ trunk/build/aggregate/soa-site/pom.xml 2011-08-07 21:41:26 UTC (rev 33651) @@ -7,8 +7,8 @@ <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.site.aggregate</artifactId> - <name>JBoss Tools Aggregate Site</name> + <artifactId>org.jboss.tools.site.aggregate.soa-tooling</artifactId> + <name>JBoss Tools - SOA Tooling Site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> @@ -100,7 +100,7 @@ </repository> <repository> <id>jbosstools-requirements-composite-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/indigo/</url> + <url>http://download.jboss.org/jbosstools/updates/indigo/SR0/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33650 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/jsp_application and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-07 17:37:29 -0400 (Sun, 07 Aug 2011) New Revision: 33650 Removed: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_10.png Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_11.png trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_12.png trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_13.png trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_8a.png trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_9.png trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml Log: updated for TOOLSDOC-236 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-07 21:37:12 UTC (rev 33649) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-07 21:37:29 UTC (rev 33650) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>4.1</productnumber> <edition>4.1.0</edition> -<pubsnumber>9</pubsnumber> +<pubsnumber>10</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract> Deleted: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_10.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_11.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_12.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_13.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_8a.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_9.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-08-07 21:37:12 UTC (rev 33649) +++ trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-08-07 21:37:29 UTC (rev 33650) @@ -265,14 +265,14 @@ <para> Writing ant scripts and managing the packaging process can be quite a complicated and time consuming task for even the most trivial web applications. However, <property>JBoss Developer Studio</property> relieves you of this burden. All you need is to start <property>JBoss Server</property> and launch your application in your favorite browser. </para> -  + <section id="AutoRedeploy"> <?dbhtml filename="AutoRedeploy.html"?> <title>Auto redeploy</title>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33649 - in branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US: images/jsp_application and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-07 17:37:12 -0400 (Sun, 07 Aug 2011) New Revision: 33649 Removed: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_10.png Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_11.png branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_12.png branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_13.png branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_8a.png branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_9.png branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml Log: updated for TOOLSDOC-236 Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-06 00:20:57 UTC (rev 33648) +++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-07 21:37:12 UTC (rev 33649) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>4.1</productnumber> <edition>4.1.0</edition> -<pubsnumber>9</pubsnumber> +<pubsnumber>10</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract> Deleted: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_10.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_11.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_12.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_13.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_8a.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/images/jsp_application/jsp_application_9.png =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml =================================================================== --- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-08-06 00:20:57 UTC (rev 33648) +++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-08-07 21:37:12 UTC (rev 33649) @@ -265,14 +265,14 @@ <para> Writing ant scripts and managing the packaging process can be quite a complicated and time consuming task for even the most trivial web applications. However, <property>JBoss Developer Studio</property> relieves you of this burden. All you need is to start <property>JBoss Server</property> and launch your application in your favorite browser. </para> -  + <section id="AutoRedeploy"> <?dbhtml filename="AutoRedeploy.html"?> <title>Auto redeploy</title>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33648 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-08-05 20:20:57 -0400 (Fri, 05 Aug 2011) New Revision: 33648 Removed: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FileUtil.java Log: unused class FileUtil removed Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FileUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FileUtil.java 2011-08-06 00:20:20 UTC (rev 33647) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FileUtil.java 2011-08-06 00:20:57 UTC (rev 33648) @@ -1,119 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.util; - -import java.io.*; -import java.util.jar.*; - -/** - * @deprecated This class has been replaced to org.jboss.tools.common plugin (org.jboss.tools.common.util.FileUtil) - */ -public final class FileUtil { - - public FileUtil() {} - - public static String readFile(File f) { - return org.jboss.tools.common.util.FileUtil.readFile(f); - } - - public static boolean isTextFile(File f, int length) { - return org.jboss.tools.common.util.FileUtil.isTextFile(f, length); - } - - public static boolean isText(String body) { - return org.jboss.tools.common.util.FileUtil.isText(body); - } - - public static String readStream(InputStream is) { - return org.jboss.tools.common.util.FileUtil.readStream(is); - } - - public static boolean writeFile(File f, String value) { - return org.jboss.tools.common.util.FileUtil.writeFile(f, value); - } - - public static boolean copyFile(File source, File dest, boolean mkdirs) { - return org.jboss.tools.common.util.FileUtil.copyFile(source, dest, mkdirs); - } - - public static boolean copyFile(File source, File dest) { - return org.jboss.tools.common.util.FileUtil.copyFile(source, dest); - } - - public static void copyStream(InputStream is, OutputStream os) throws IOException { - org.jboss.tools.common.util.FileUtil.copyStream(is, os); - } - - public static void clear(File f) { - org.jboss.tools.common.util.FileUtil.clear(f); - } - - public static void remove(File f) { - org.jboss.tools.common.util.FileUtil.remove(f); - } - - static boolean isSameFile(File f) { - return org.jboss.tools.common.util.FileUtil.isSameFile(f); - } - - public static void copyDir(File from, File to) { - org.jboss.tools.common.util.FileUtil.copyDir(from, to); - } - - public static void copyDir(File from, File to, boolean mkdirs) { - copyDir(from, to, mkdirs, true); - } - - public static void copyDir(File from, File to, boolean mkdirs, boolean includeSubdirs) { - org.jboss.tools.common.util.FileUtil.copyDir(from, to, mkdirs, includeSubdirs); - } - - public static void copyDir(File from, boolean includeSubdirs, File to) { - org.jboss.tools.common.util.FileUtil.copyDir(from, includeSubdirs, to); - } - - public static void unjar(File dest, String jar) throws Exception { - org.jboss.tools.common.util.FileUtil.unjar(dest, jar); - } - - public static void unjar(File dest, InputStream is) throws Exception { - org.jboss.tools.common.util.FileUtil.unjar(dest, is); - } - - public static void jar(File[] fs, String path) throws Exception { - org.jboss.tools.common.util.FileUtil.jar(fs, path); - } - - public static void jar(File[] fs, String path, Manifest mf) throws Exception { - org.jboss.tools.common.util.FileUtil.jar(fs, path, mf); - } - - public static void add(File root, File f, JarOutputStream jos) throws Exception { - org.jboss.tools.common.util.FileUtil.add(root, f, jos); - } - - public static void add(File f, String name, JarOutputStream jos) throws Exception { - org.jboss.tools.common.util.FileUtil.add(f, name, jos); - } - - public static void copy(InputStream f, OutputStream t) throws Exception { - org.jboss.tools.common.util.FileUtil.copy(f, t); - } - - public static String fileURLToFilePath(String url) { - return org.jboss.tools.common.util.FileUtil.fileURLToFilePath(url); - } - - public static String getRelativePath(String rootpath, String path) { - return org.jboss.tools.common.util.FileUtil.getRelativePath(rootpath, path); - } - -}

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33647 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-08-05 20:20:20 -0400 (Fri, 05 Aug 2011) New Revision: 33647 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java Log: Code cleanup, not needed null checks were removed Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2011-08-06 00:17:32 UTC (rev 33646) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2011-08-06 00:20:20 UTC (rev 33647) @@ -348,19 +348,26 @@ os.flush(); } - public static void clear(File f) { - if(!f.isDirectory()) return; - File[] fs = f.listFiles(); - if(fs != null) for (int i = 0; i < fs.length; i++) remove(fs[i]); - } + public static void clear(File f) { + if (f.isDirectory()) { + File[] fs = f.listFiles(); + for (int i = 0; i < fs.length; i++) { + remove(fs[i]); + } + } + } - public static void remove(File f) { - if(f.isFile()) f.delete(); - if(!f.isDirectory()) return; - File[] fs = f.listFiles(); - if(fs != null) for (int i = 0; i < fs.length; i++) remove(fs[i]); - f.delete(); - } + public static void remove(File f) { + if (f.isFile()) { + f.delete(); + } else if (f.isDirectory()) { + File[] fs = f.listFiles(); + for (int i = 0; i < fs.length; i++) { + remove(fs[i]); + } + f.delete(); + } + } public static boolean isSameFile(File f) { if(!f.exists()) return false;

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r33646 - in trunk/cdi: tests/org.jboss.tools.cdi.ui.test and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-08-05 20:17:32 -0400 (Fri, 05 Aug 2011) New Revision: 33646 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralCreationWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIElementWizard.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java Log: Minor performance improvements for cdi tests. Opening editor after finishing wizards is now configurable. Wizards don't open editors during tests and it should save some time Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralCreationWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralCreationWizard.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralCreationWizard.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -23,51 +23,67 @@ /** * * @author Viacheslav Kabanovich - * + * */ public class NewAnnotationLiteralCreationWizard extends NewElementWizard { private NewClassWizardPage fPage; - private boolean fOpenEditorOnFinish = true; + private boolean fOpenEditorOnFinish = true; - public NewAnnotationLiteralCreationWizard() { setWindowTitle(CDIUIMessages.NEW_ANNOTATION_LITERAL_WIZARD_TITLE); } + public boolean isOpenEditorAfterFinish() { + return fOpenEditorOnFinish; + } + + public void setOpenEditorAfterFinish(boolean set) { + this.fOpenEditorOnFinish = set; + } + /* * @see Wizard#createPages */ public void addPages() { super.addPages(); if (fPage == null) { - fPage = new NewAnnotationLiteralWizardPage(); + fPage = new NewAnnotationLiteralWizardPage(); fPage.init(getSelection()); } addPage(fPage); } - /*(non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#canRunForked() */ protected boolean canRunForked() { return !fPage.isEnclosingTypeSelected(); } - /* (non-Javadoc) - * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor) + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse + * .core.runtime.IProgressMonitor) */ - protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { + protected void finishPage(IProgressMonitor monitor) + throws InterruptedException, CoreException { fPage.createType(monitor); // use the full progress monitor } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.jface.wizard.IWizard#performFinish() */ public boolean performFinish() { warnAboutTypeCommentDeprecation(); - boolean res= super.performFinish(); + boolean res = super.performFinish(); if (res) { - IResource resource= fPage.getModifiedResource(); + IResource resource = fPage.getModifiedResource(); if (resource != null) { selectAndReveal(resource); if (fOpenEditorOnFinish) { @@ -78,12 +94,14 @@ return res; } - /* (non-Javadoc) - * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement() + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement() */ public IJavaElement getCreatedElement() { return fPage.getCreatedType(); } - } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -56,6 +56,8 @@ private WizardNewFileCreationPage mainPage; + private boolean fOpenEditorOnFinish; + /** * Creates a wizard for creating a new file resource in the workspace. */ @@ -95,34 +97,41 @@ setDefaultPageImageDescriptor(desc); } - /* (non-Javadoc) - * Method declared on IWizard. - */ - public boolean performFinish() { - IFile file = mainPage.createNewFile(); - if (file == null) { + public boolean isOpenEditorAfterFinish() { + return fOpenEditorOnFinish; + } + + public void setOpenEditorAfterFinish(boolean set) { + this.fOpenEditorOnFinish = set; + } + + /* + * (non-Javadoc) Method declared on IWizard. + */ + public boolean performFinish() { + IFile file = mainPage.createNewFile(); + if (file == null) { return false; } - selectAndReveal(file); + selectAndReveal(file); + if (fOpenEditorOnFinish) { + // Open editor on new file. + IWorkbenchWindow dw = getWorkbench().getActiveWorkbenchWindow(); + try { + if (dw != null) { + IWorkbenchPage page = dw.getActivePage(); + if (page != null) { + IDE.openEditor(page, file, true); + } + } + } catch (PartInitException e) { + DialogUtil.openError(dw.getShell(), ResourceMessages.FileResource_errorMessage, e.getMessage(), e); + } + } + return true; + } - // Open editor on new file. - IWorkbenchWindow dw = getWorkbench().getActiveWorkbenchWindow(); - try { - if (dw != null) { - IWorkbenchPage page = dw.getActivePage(); - if (page != null) { - IDE.openEditor(page, file, true); - } - } - } catch (PartInitException e) { - DialogUtil.openError(dw.getShell(), ResourceMessages.FileResource_errorMessage, - e.getMessage(), e); - } - - return true; - } - class WizardNewBeansXMLFileCreationPage extends WizardNewFileCreationPage { public WizardNewBeansXMLFileCreationPage(String pageName, IStructuredSelection selection) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIElementWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIElementWizard.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIElementWizard.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -23,6 +23,14 @@ this.adapter = adapter; } + public boolean isOpenEditorAfterFinish() { + return fOpenEditorOnFinish; + } + + public void setOpenEditorAfterFinish(boolean set) { + this.fOpenEditorOnFinish = set; + } + public String getQualifiedClassName() { IType type = fPage.getCreatedType(); return type == null ? "" : type.getFullyQualifiedName(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-08-06 00:17:32 UTC (rev 33646) @@ -30,4 +30,21 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>profiler</id> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <argLine>-XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -30,7 +30,7 @@ public CATest() { super(); try { - project = TCKTest.importPreparedProject("/tests/lookup"); + project = TCKUITest.importPreparedProject("/tests/lookup"); caTest.setProject(project); } catch (Exception e) { e.printStackTrace(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -14,6 +14,7 @@ import junit.framework.TestSuite; import org.apache.xerces.impl.validation.ValidationManager; +import org.eclipse.core.internal.jobs.JobManager; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -48,7 +49,6 @@ public static Test suite() { // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().shutdown(); - try { ResourcesUtils.setBuildAutomatically(false); ValidationFramework.getDefault().suspendAllValidation(true); @@ -73,6 +73,9 @@ protected void setUp() throws Exception { tckProject = TCKUITest.importPreparedProject("/"); } + protected void tearDown() throws Exception { + tckProject.delete(true, true, null); + } } ); Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -3,9 +3,11 @@ import java.io.File; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -61,6 +63,8 @@ File webInfTo = new File(projectPath + WEB_CONTENT_SUFFIX + WEB_INF_SUFFIX); FileUtil.copyDir(from, webInfTo, true, true, true, new XmlFileFilter()); } + + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); project.build(IncrementalProjectBuilder.CLEAN_BUILD,null); project.build(IncrementalProjectBuilder.FULL_BUILD,null); TestUtil._waitForValidation(project); Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-08-06 00:15:14 UTC (rev 33645) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/NewCDIWizardTest.java 2011-08-06 00:17:32 UTC (rev 33646) @@ -30,7 +30,6 @@ import org.eclipse.jdt.ui.wizards.NewTypeWizardPage; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.PlatformUI; @@ -43,10 +42,11 @@ import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -//import org.jboss.tools.cdi.ui.wizard.NewCDIAnnotationWizardPage; +import org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard; import org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralWizardPage; import org.jboss.tools.cdi.ui.wizard.NewBeanWizardPage; import org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard; +import org.jboss.tools.cdi.ui.wizard.NewCDIElementWizard; import org.jboss.tools.cdi.ui.wizard.NewDecoratorWizardPage; import org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingWizardPage; import org.jboss.tools.cdi.ui.wizard.NewInterceptorWizardPage; @@ -58,7 +58,6 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.test.util.JUnitUtils; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.WorkbenchUtils; /** @@ -95,6 +94,11 @@ tck = ResourcesPlugin.getWorkspace().getRoot().getProject("tck"); jp = EclipseUtil.getJavaProject(tck); wizard.init(CDIUIPlugin.getDefault().getWorkbench(), new StructuredSelection(jp)); + if(wizard instanceof NewCDIElementWizard) { + ((NewCDIElementWizard)wizard).setOpenEditorAfterFinish(false); + } else if(wizard instanceof NewAnnotationLiteralCreationWizard) { + ((NewAnnotationLiteralCreationWizard)wizard).setOpenEditorAfterFinish(false); + } dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); @@ -151,6 +155,7 @@ dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); + wizard.setOpenEditorAfterFinish(false); dialog.setBlockOnOpen(false); dialog.open(); }

14 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2011