[jbosstools-commits] JBoss Tools SVN: r41949 - in trunk: hibernatetools/plugins and 5 other directories.

Author: dgolovin Date: 2012-06-13 19:40:33 -0400 (Wed, 13 Jun 2012) New Revision: 41949 Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml trunk/hibernatetools/plugins/pom.xml trunk/hibernatetools/tests/pom.xml trunk/maven/features/pom.xml trunk/maven/plugins/pom.xml trunk/maven/site/category.xml trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java Log: to get build back woking hibernate jpa and mavem gwt configurator plugins are excluded from aggregation pom.xml's due to: -hibernate jpa plugins required migration -maven gwt configurator dependes on google plugins not compatible with Juno Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -22,7 +22,8 @@ <plugin id="org.jboss.tools.hibernate.ui.test" download-size="0" install-size="0" version="0.0.0" /> <!-- TODO: should these be enabled / built? --> - <plugin id="org.jboss.tools.hibernate.jpt.core.test" download-size="0" install-size="0" version="0.0.0" /> + <!-- commented until migration to juno is finished --> + <!-- plugin id="org.jboss.tools.hibernate.jpt.core.test" download-size="0" install-size="0" version="0.0.0" / --> <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> </feature> Modified: trunk/hibernatetools/plugins/pom.xml =================================================================== --- trunk/hibernatetools/plugins/pom.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/hibernatetools/plugins/pom.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -19,8 +19,9 @@ <module>org.hibernate.eclipse.jdt.ui</module> <module>org.hibernate.eclipse.mapper</module> <module>org.hibernate.eclipse.libs</module> - <module>org.jboss.tools.hibernate.jpt.core</module> - <module>org.jboss.tools.hibernate.jpt.ui</module> + <!-- commented until migration to juno is finished --> + <!-- module>org.jboss.tools.hibernate.jpt.core</module> + <module>org.jboss.tools.hibernate.jpt.ui</module --> <module>org.jboss.tools.hibernate.ui</module> <module>org.jboss.tools.hibernate.xml</module> <module>org.jboss.tools.hibernate.xml.ui</module> Modified: trunk/hibernatetools/tests/pom.xml =================================================================== --- trunk/hibernatetools/tests/pom.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/hibernatetools/tests/pom.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -16,7 +16,8 @@ <module>org.hibernate.eclipse.jdt.ui.test</module> <module>org.jboss.tools.hibernate.ui.test</module> <!-- TODO: should these be enabled / built? --> - <module>org.jboss.tools.hibernate.jpt.core.test</module> + <!-- commented until migration to juno is finished --> + <!--module>org.jboss.tools.hibernate.jpt.core.test</module--> <module>org.jboss.tools.hibernate.ui.bot.test</module> </modules> </project> Modified: trunk/maven/features/pom.xml =================================================================== --- trunk/maven/features/pom.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/maven/features/pom.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -25,8 +25,8 @@ <module>org.jboss.tools.maven.jbosspackaging.feature</module> <module>org.jboss.tools.maven.jpa.feature</module> <module>org.jboss.tools.maven.profiles.feature</module> - <module>org.jboss.tools.maven.gwt.feature</module> + <!--module>org.jboss.tools.maven.gwt.feature</module--> <module>org.jboss.tools.maven.sourcelookup.feature</module> - <module>org.jboss.tools.maven.jdt.feature</module> + <module>org.jboss.tools.maven.jdt.feature</module> </modules> </project> Modified: trunk/maven/plugins/pom.xml =================================================================== --- trunk/maven/plugins/pom.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/maven/plugins/pom.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -27,7 +27,7 @@ <module>org.jboss.tools.maven.jpa</module> <module>org.jboss.tools.maven.profiles.core</module> <module>org.jboss.tools.maven.profiles.ui</module> - <module>org.jboss.tools.maven.gwt</module> + <!--module>org.jboss.tools.maven.gwt</module--> <module>org.jboss.tools.maven.sourcelookup.core</module> <module>org.jboss.tools.maven.sourcelookup.ui</module> <module>org.jboss.tools.maven.jdt</module> Modified: trunk/maven/site/category.xml =================================================================== --- trunk/maven/site/category.xml 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/maven/site/category.xml 2012-06-13 23:40:33 UTC (rev 41949) @@ -41,9 +41,9 @@ <feature url="features/org.jboss.tools.maven.profiles.feature_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature> - <feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0"> + <!--feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> - </feature> + </feature--> <feature url="features/org.jboss.tools.maven.sourcelookup.feature_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature> @@ -87,9 +87,9 @@ <feature url="features/org.jboss.tools.maven.profiles.feature.source_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature.source" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature> - <feature url="features/org.jboss.tools.maven.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature.source" version="0.0.0"> + <!--feature url="features/org.jboss.tools.maven.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature.source" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> - </feature> + </feature--> <feature url="features/org.jboss.tools.maven.sourcelookup.feature.source_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature.source" version="0.0.0"> <category name="JBoss Tools maven Nightly Build Update Site"/> </feature> Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-06-13 23:00:36 UTC (rev 41948) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-06-13 23:40:33 UTC (rev 41949) @@ -1,6 +1,7 @@ package org.jboss.tools.maven.configurators.tests; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jpt.jpa.core.JpaFacet; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; @@ -22,8 +23,9 @@ assertIsJpaProject(project, JpaFacet.VERSION_2_0); assertNoErrors(project); - JpaProjectManager manager = JptJpaCorePlugin.getJpaProjectManager(); - JpaProject jpa = manager.getJpaProject(project); + JpaProjectManager manager = JptJpaCorePlugin.getJpaProjectManager(ResourcesPlugin.getWorkspace()); + JpaProject jpa = (JpaProject)project.getAdapter(JpaProject.class); + //manager.getJpaProject(project); String pid = jpa.getJpaPlatform().getId(); assertTrue(pid + " is not the expected platform", pid.startsWith("eclipselink") || pid.startsWith("generic")); @@ -31,7 +33,8 @@ waitForJobsToComplete(); assertIsJpaProject(project, JpaFacet.VERSION_1_0); assertNoErrors(project); - jpa = manager.getJpaProject(project); + jpa = (JpaProject)project.getAdapter(JpaProject.class); + //jpa = manager.getJpaProject(project); pid = jpa.getJpaPlatform().getId(); assertTrue(pid + " is not the expected hibernate platform", pid.startsWith("hibernate") || pid.startsWith("generic")); }