Author: fbricon Date: 2012-10-03 13:10:30 -0400 (Wed, 03 Oct 2012) New Revision: 44253 Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/pom.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/pom.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/JavaUtil.java trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java Log: JBIDE-12727 : JAXRS facet incorrectly activated Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/JavaUtil.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/JavaUtil.java 2012-10-03 16:47:30 UTC (rev 44252) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/JavaUtil.java 2012-10-03 17:10:30 UTC (rev 44253) @@ -4,7 +4,6 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.jboss.tools.common.util.EclipseJavaUtil; /** * @@ -42,7 +41,7 @@ boolean result = false; if (javaProject != null) { try { - result = EclipseJavaUtil.findType(javaProject, className) != null; + result = javaProject.findType(className) != null; } catch (JavaModelException e) { e.printStackTrace(); } Modified: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java 2012-10-03 16:47:30 UTC (rev 44252) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/src/org/jboss/tools/maven/jaxrs/configurators/JaxrsProjectConfigurator.java 2012-10-03 17:10:30 UTC (rev 44253) @@ -41,7 +41,6 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.common.util.EclipseJavaUtil; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.ProjectUtil; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; @@ -183,12 +182,12 @@ if (javaProject != null) { IType type = null; try { - type = EclipseJavaUtil.findType(javaProject, "javax.ws.rs.ApplicationPath");//$NON-NLS-1$ + type = javaProject.findType("javax.ws.rs.ApplicationPath");//$NON-NLS-1$ if (type != null) { return JAX_RS_FACET_1_1; } - type = EclipseJavaUtil.findType(javaProject, "javax.ws.rs.Path");//$NON-NLS-1$ + type = javaProject.findType("javax.ws.rs.Path");//$NON-NLS-1$ if (type != null) { return JAX_RS_FACET_1_0; } Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/pom.xml 2012-10-03 17:10:30 UTC (rev 44253) @@ -0,0 +1,33 @@ +<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-chimera</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>jaxrs-api</artifactId> + <version>2.2-beta-1</version> + <scope>provided</scope> + </dependency> + </dependencies> + <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> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/jaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml 2012-10-03 17:10:30 UTC (rev 44253) @@ -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"> + <!-- This is a nice comment --> + <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/chimera/nojaxrs/jaxrs-chimera/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/pom.xml 2012-10-03 17:10:30 UTC (rev 44253) @@ -0,0 +1,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>jaxrs-chimera</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>war</packaging> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/chimera/nojaxrs/jaxrs-chimera/src/main/webapp/WEB-INF/web.xml 2012-10-03 17:10:30 UTC (rev 44253) @@ -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"> + <!-- This is a nice comment --> + <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> Modified: 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 2012-10-03 16:47:30 UTC (rev 44252) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java 2012-10-03 17:10:30 UTC (rev 44253) @@ -59,6 +59,27 @@ assertIsJaxRsProject(jaxRsProject, JaxrsProjectConfigurator.JAX_RS_FACET_1_1); } + @Test + public void testJBIDE12727_badCaching() throws Exception { + String projectLocation = "projects/jaxrs/chimera/"; + IProject jaxRsProject = importProject(projectLocation+"/jaxrs/jaxrs-chimera/pom.xml"); + waitForJobsToComplete(new NullProgressMonitor()); + IFacetedProject facetedProject = ProjectFacetsManager.create(jaxRsProject); + assertNotNull(jaxRsProject.getName() + " is not a faceted project", facetedProject); + assertTrue("JAX-RS Facet should be present", facetedProject.hasProjectFacet(JaxrsProjectConfigurator.JAX_RS_FACET)); + + + jaxRsProject.delete(true, monitor); + waitForJobsToComplete(); + + jaxRsProject = importProject(projectLocation+"/nojaxrs/jaxrs-chimera/pom.xml"); + waitForJobsToComplete(new NullProgressMonitor()); + assertNoErrors(jaxRsProject); + facetedProject = ProjectFacetsManager.create(jaxRsProject); + assertFalse("JAX-RS Facet should be missing", facetedProject.hasProjectFacet(JaxrsProjectConfigurator.JAX_RS_FACET)); + } + + private void assertHasJaxRsConfigurationError(IProject project, String message) throws Exception { WorkspaceHelpers.assertErrorMarker(MavenJaxRsConstants.JAXRS_CONFIGURATION_ERROR_MARKER_ID, message, 1, "", project); }