August 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r43329 - in trunk/maven/features: org.jboss.tools.maven.feature and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-08-30 11:43:22 -0400 (Thu, 30 Aug 2012) New Revision: 43329 Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jbosspackaging.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml Log: JBIDE-12293 : add m2e-wtp 0.16.0 from eclipse.org as a required feature Modified: trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.cdi.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  <import feature="com.google.gdt.eclipse.suite.e42.feature" version="3.0.1" match="greaterOrEqual"/> </requires> Modified: trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.jaxrs.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.jbosspackaging.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jbosspackaging.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.jbosspackaging.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  <import feature="org.jboss.ide.eclipse.as.feature" version="2.3.0" match="greaterOrEqual"/> </requires> Modified: trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.jsf.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,10 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  - </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.portlet.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  </requires> <plugin Modified: trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.project.examples.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  <import feature="org.jboss.tools.project.examples.feature" version="1.2.0" match="greaterOrEqual"/> </requires> Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2012-08-30 14:40:12 UTC (rev 43328) +++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2012-08-30 15:43:22 UTC (rev 43329) @@ -20,9 +20,7 @@ <requires> <import feature="org.eclipse.m2e.feature" version="1.1.0" match="greaterOrEqual"/> -  </requires> <plugin

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43328 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: src/org/jboss/ide/eclipse/as/ui/bot/test/ejb and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: psuchy Date: 2012-08-30 10:40:12 -0400 (Thu, 30 Aug 2012) New Revision: 43328 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/ejb/EJBWizardsTest.java Log: Edit EJBWizardsTest to be able to build Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF 2012-08-30 14:36:31 UTC (rev 43327) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF 2012-08-30 14:40:12 UTC (rev 43328) @@ -17,3 +17,5 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss by Red Hat +Import-Package: org.eclipse.core.resources, + org.eclipse.swtbot.swt.finder.junit Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/ejb/EJBWizardsTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/ejb/EJBWizardsTest.java 2012-08-30 14:36:31 UTC (rev 43327) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/ejb/EJBWizardsTest.java 2012-08-30 14:40:12 UTC (rev 43328) @@ -5,8 +5,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.m2e.tests.common.JobHelpers; -import org.eclipse.m2e.tests.common.WorkspaceHelpers; import org.eclipse.swt.widgets.Shell; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; @@ -19,11 +17,11 @@ import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -@SuppressWarnings("restriction") @RunWith(SWTBotJunit4ClassRunner.class) public class EJBWizardsTest { @@ -35,12 +33,13 @@ } private static SWTWorkbenchBot initSWTBot() throws CoreException, - InterruptedException { + InterruptedException { SWTWorkbenchBot swtbot = new SWTWorkbenchBot(); SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US"; SWTBotPreferences.TIMEOUT = 1000; SWTBotPreferences.PLAYBACK_DELAY = 5; - waitForIdle(); + SWTUtilExt util = new SWTUtilExt(bot); + util.waitForAll(); try { SWTBotView view = swtbot.viewByTitle("Welcome"); if (view != null) { @@ -81,7 +80,7 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot() .getProject(projectName); - WorkspaceHelpers.assertNoErrors(project); + //WorkspaceHelpers.assertNoErrors(project); } @Test @@ -91,7 +90,7 @@ createEJBProjectWithDescriptor(projectName); IProject project = ResourcesPlugin.getWorkspace().getRoot() .getProject(projectName); - WorkspaceHelpers.assertNoErrors(project); + //WorkspaceHelpers.assertNoErrors(project); } @Test @@ -107,7 +106,8 @@ createEJBProjectWithoutDescriptor(projectName); createPackage(projectName, packageName); } - + + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -118,7 +118,7 @@ botExt.comboBoxWithLabel("State type:").setSelection("Stateless"); botExt.textWithLabel("Class name:").setText(fileName); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); } @Test @@ -127,14 +127,15 @@ String projectName = "sessionBeans"; String fileName = "StatefulBean"; String packageName = "beans"; - + IProject project = ResourcesPlugin.getWorkspace().getRoot() .getProject(projectName); if (!project.exists()) { createEJBProjectWithoutDescriptor(projectName); createPackage(projectName, packageName); } - + + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -145,7 +146,7 @@ botExt.textWithLabel("Class name:").setText(fileName); botExt.comboBoxWithLabel("State type:").setSelection("Stateful"); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); } @Test @@ -162,7 +163,8 @@ createEJBProjectWithoutDescriptor(projectName); createPackage(projectName, packageName); } - + + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -173,7 +175,7 @@ botExt.textWithLabel("Class name:").setText(fileName); botExt.comboBoxWithLabel("State type:").setSelection("Singleton"); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); } @Test @@ -190,7 +192,8 @@ createEJBProjectWithoutDescriptor(projectName); createPackage(projectName, packageName); } - + + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -200,13 +203,14 @@ botExt.textWithLabel("Java package:").setText(packageName); botExt.textWithLabel("Class name:").setText(fileName); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); } private void createEJBProjectWithoutDescriptor(String projectName) throws InterruptedException, CoreException { + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -216,13 +220,14 @@ botExt.button("Next >").click(); botExt.button("Next >").click(); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); botExt.button("No").click(); - waitForIdle(); + util.waitForAll(); } private void createEJBProjectWithDescriptor(String projectName) throws InterruptedException, CoreException { + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -233,13 +238,14 @@ botExt.button("Next >").click(); botExt.checkBox("Generate ejb-jar.xml deployment descriptor").select(); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); botExt.button("No").click(); - waitForIdle(); + util.waitForAll(); } private static void createPackage(String projectName, String packageName) throws InterruptedException { + SWTUtilExt util = new SWTUtilExt(bot); SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); SWTBot shell = botExt.shell("New").activate().bot(); @@ -249,12 +255,6 @@ projectName + "/ejbModule"); botExt.textWithLabel("Name:").setText(packageName); botExt.button("Finish").click(); - waitForIdle(); + util.waitForAll(); } - - private static void waitForIdle() throws InterruptedException { - JobHelpers.waitForLaunchesToComplete(30 * 1000); - JobHelpers.waitForJobsToComplete(); - } - }

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43327 - in trunk/forge/plugins/org.jboss.tools.forge.runtime: META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2012-08-30 10:36:31 -0400 (Thu, 30 Aug 2012) New Revision: 43327 Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/ trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml Log: JBIDE-12515: Update Forge Embedded Runtime to 1.0.6.Final Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime ___________________________________________________________________ Modified: svn:ignore - forge-distribution-1.0.3.Final target forge-distribution-1.0.4.Final forge-distribution-1.0.5.Final + forge-distribution-1.0.3.Final target forge-distribution-1.0.4.Final forge-distribution-1.0.5.Final forge-distribution-1.0.6.Final Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2012-08-30 11:54:17 UTC (rev 43326) +++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2012-08-30 14:36:31 UTC (rev 43327) @@ -3,8 +3,8 @@ <classpathentry kind="src" path="src"/> <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 exported="true" kind="lib" path="forge-distribution-1.0.5.Final/modules/javax/inject/api/main/javax.inject-1.jar"/> - <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.5.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar"/> - <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.5.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.5.Final.jar"/> + <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.6.Final/modules/javax/inject/api/main/javax.inject-1.jar"/> + <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.6.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar"/> + <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.6.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.6.Final.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2012-08-30 11:54:17 UTC (rev 43326) +++ trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2012-08-30 14:36:31 UTC (rev 43327) @@ -16,7 +16,7 @@ org.jboss.forge.shell.command, org.jboss.forge.shell.events, org.jboss.forge.shell.spi -Bundle-ClassPath: forge-distribution-1.0.5.Final/modules/javax/inject/api/main/javax.inject-1.jar, - forge-distribution-1.0.5.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar, - forge-distribution-1.0.5.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.5.Final.jar +Bundle-ClassPath: forge-distribution-1.0.6.Final/modules/javax/inject/api/main/javax.inject-1.jar, + forge-distribution-1.0.6.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar, + forge-distribution-1.0.6.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.6.Final.jar Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-08-30 11:54:17 UTC (rev 43326) +++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-08-30 14:36:31 UTC (rev 43327) @@ -1,5 +1,5 @@ bin.includes = META-INF/,\ - forge-distribution-1.0.5.Final/,\ + forge-distribution-1.0.6.Final/,\ plugin.properties src.includes = * jars.compile.order = . Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-08-30 11:54:17 UTC (rev 43326) +++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-08-30 14:36:31 UTC (rev 43327) @@ -28,7 +28,7 @@ <artifactItem> <groupId>org.jboss.forge</groupId> <artifactId>forge-distribution</artifactId> - <version>1.0.5.Final</version> + <version>1.0.6.Final</version> <type>zip</type> </artifactItem> </artifactItems>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43326 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-08-30 07:54:17 -0400 (Thu, 30 Aug 2012) New Revision: 43326 Modified: trunk/build/target-platform/pom.xml Log: Restored target-platform-validation-plugin Modified: trunk/build/target-platform/pom.xml =================================================================== --- trunk/build/target-platform/pom.xml 2012-08-30 11:35:08 UTC (rev 43325) +++ trunk/build/target-platform/pom.xml 2012-08-30 11:54:17 UTC (rev 43326) @@ -20,13 +20,37 @@ <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   - <tychoVersion>0.15.0</tychoVersion> - <tychoExtrasVersion>0.15.0</tychoExtrasVersion> + <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> + <tychoExtrasVersion>0.16.0-SNAPSHOT</tychoExtrasVersion> </properties> <build> <plugins> <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>target-platform-validation-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>validate-target-platform</goal> + </goals> + <configuration> + <targetFiles> + <param>multiple.target</param> +  + <param>unified.target</param> +  + </targetFiles> + <failOnError>true</failOnError> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.3</version>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43325 - branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-08-30 07:35:08 -0400 (Thu, 30 Aug 2012) New Revision: 43325 Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties Log: Revert previous commit Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties 2012-08-30 11:33:30 UTC (rev 43324) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties 2012-08-30 11:35:08 UTC (rev 43325) @@ -8,4 +8,5 @@ about.mappings,\ about.ini,\ about.html,\ - jboss_about.png + jboss_about.png,\ + lib/

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43324 - trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-08-30 07:33:30 -0400 (Thu, 30 Aug 2012) New Revision: 43324 Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties Log: fix failing build Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties 2012-08-30 11:23:49 UTC (rev 43323) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/build.properties 2012-08-30 11:33:30 UTC (rev 43324) @@ -8,5 +8,4 @@ about.mappings,\ about.ini,\ about.html,\ - jboss_about.png,\ - lib/ + jboss_about.png

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43323 - in trunk/runtime: features and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-08-30 07:23:49 -0400 (Thu, 30 Aug 2012) New Revision: 43323 Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml trunk/runtime/features/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml trunk/runtime/plugins/pom.xml trunk/runtime/pom.xml trunk/runtime/site/pom.xml trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml trunk/runtime/tests/pom.xml Log: JBIDE-12513 upgrade runtime component version Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/features/org.jboss.tools.runtime.core.feature/feature.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.runtime.core.feature" label="%featureName" - version="1.4.0.qualifier" + version="2.0.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.runtime.core"> Modified: trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/features/org.jboss.tools.runtime.core.feature/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>features</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime.features</groupId> <artifactId>org.jboss.tools.runtime.core.feature</artifactId> @@ -44,4 +44,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.runtime.test.feature" label="JBoss Tools - Tests - Runtime Detection" - version="1.4.0.qualifier"> + version="2.0.0.qualifier"> <description> %description Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/features/org.jboss.tools.runtime.test.feature/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>features</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime.features</groupId> <artifactId>org.jboss.tools.runtime.test.feature</artifactId> Modified: trunk/runtime/features/pom.xml =================================================================== --- trunk/runtime/features/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/features/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>runtime</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>features</artifactId> Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/META-INF/MANIFEST.MF 2012-08-30 11:23:49 UTC (rev 43323) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.core;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.jboss.tools.runtime.core.RuntimeCoreActivator Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0" Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/plugins/org.jboss.tools.runtime.core/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>plugins</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime.plugins</groupId> <artifactId>org.jboss.tools.runtime.core</artifactId> Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/META-INF/MANIFEST.MF 2012-08-30 11:23:49 UTC (rev 43323) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.ui;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.jboss.tools.runtime.ui.RuntimeUIActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,10 +5,10 @@ <parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>plugins</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime.plugins</groupId> <artifactId>org.jboss.tools.runtime.ui</artifactId> <packaging>eclipse-plugin</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/runtime/plugins/pom.xml =================================================================== --- trunk/runtime/plugins/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/plugins/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>runtime</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>plugins</artifactId> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -10,7 +10,7 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>runtime</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>runtime.all</name> <packaging>pom</packaging> <modules> Modified: trunk/runtime/site/pom.xml =================================================================== --- trunk/runtime/site/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/site/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,11 +5,11 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>runtime</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>runtime.site</artifactId> <name>runtime.site</name> <packaging>eclipse-repository</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2012-08-30 11:23:49 UTC (rev 43323) @@ -3,7 +3,7 @@ Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.test;singleton:=true Bundle-Activator: org.jboss.tools.runtime.test.RuntimeTestActivator -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 2.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", org.jboss.tools.runtime.ui, Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>tests</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime.tests</groupId> <artifactId>org.jboss.tools.runtime.test</artifactId> Modified: trunk/runtime/tests/pom.xml =================================================================== --- trunk/runtime/tests/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) +++ trunk/runtime/tests/pom.xml 2012-08-30 11:23:49 UTC (rev 43323) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>runtime</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.runtime</groupId> <artifactId>tests</artifactId>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43322 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-08-30 07:13:39 -0400 (Thu, 30 Aug 2012) New Revision: 43322 Modified: trunk/build/target-platform/pom.xml Log: Try to publish target platform 4.0.0.Alpha1 Modified: trunk/build/target-platform/pom.xml =================================================================== --- trunk/build/target-platform/pom.xml 2012-08-30 10:39:06 UTC (rev 43321) +++ trunk/build/target-platform/pom.xml 2012-08-30 11:13:39 UTC (rev 43322) @@ -6,7 +6,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> --> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.target.platform</artifactId> - <version>4.0.0.M1-SNAPSHOT</version> + <version>4.0.0.Alpha1-SNAPSHOT</version> <name>JBoss Tools Target Platform Definition</name> <packaging>pom</packaging> @@ -20,37 +20,13 @@ <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl...</eclipse.URL>   - <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> - <tychoExtrasVersion>0.16.0-SNAPSHOT</tychoExtrasVersion> + <tychoVersion>0.15.0</tychoVersion> + <tychoExtrasVersion>0.15.0</tychoExtrasVersion> </properties> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>target-platform-validation-plugin</artifactId> - <version>${tychoExtrasVersion}</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>validate-target-platform</goal> - </goals> - <configuration> - <targetFiles> - <param>multiple.target</param> -  - <param>unified.target</param> -  - </targetFiles> - <failOnError>true</failOnError> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.3</version>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43321 - in trunk: as/features/org.jboss.ide.eclipse.as.feature and 37 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-08-30 06:39:06 -0400 (Thu, 30 Aug 2012) New Revision: 43321 Added: trunk/as/features/org.jboss.tools.runtime.as.detector.feature/ trunk/as/plugins/org.jboss.tools.runtime.as.detector/ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/handlers/TestHandler1.java trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionFrameworkTest.java trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeTestActivator.java trunk/seam/features/org.jboss.tools.runtime.seam.detector.feature/ trunk/seam/plugins/org.jboss.tools.runtime.seam.detector/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.classpath trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.project trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.settings/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/bin/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/build.properties trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.properties trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.xml trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/pom.xml trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/IRuntimeDetectionConstants.java trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionAllTests.java trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectorTestActivator.java trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/target/ Removed: trunk/runtime/features/org.jboss.tools.runtime.as.detector.feature/ trunk/runtime/features/org.jboss.tools.runtime.seam.detector.feature/ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/ trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/ Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml trunk/as/features/org.jboss.tools.runtime.as.detector.feature/feature.xml trunk/as/features/org.jboss.tools.runtime.as.detector.feature/pom.xml trunk/as/features/pom.xml trunk/as/plugins/org.jboss.tools.runtime.as.detector/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.tools.runtime.as.detector/about.html trunk/as/plugins/org.jboss.tools.runtime.as.detector/pom.xml trunk/as/plugins/pom.xml trunk/as/site/category.xml trunk/build/pom.xml trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml trunk/runtime/features/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/JBossRuntimeLocator.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/AbstractRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/IRuntimeDetector.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java trunk/runtime/plugins/pom.xml trunk/runtime/site/category.xml trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF trunk/runtime/tests/org.jboss.tools.runtime.test/plugin.xml trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionAllTests.java trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java trunk/seam/features/org.jboss.tools.runtime.seam.detector.feature/feature.xml trunk/seam/features/org.jboss.tools.runtime.seam.detector.feature/pom.xml trunk/seam/features/pom.xml trunk/seam/plugins/org.jboss.tools.runtime.seam.detector/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.runtime.seam.detector/pom.xml trunk/seam/plugins/pom.xml trunk/seam/site/category.xml trunk/seam/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-12447 runtime pushdown big change Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-08-30 10:19:33 UTC (rev 43320) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -39,6 +39,9 @@ <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0"/> + <includes + id="org.jboss.tools.runtime.as.detector.feature" + version="0.0.0"/> <requires> <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> @@ -78,6 +81,7 @@ <import plugin="org.eclipse.jst.common.frameworks" version="1.1.500" match="greaterOrEqual"/> <import feature="org.jboss.ide.eclipse.archives.feature"/> <import feature="org.jboss.tools.jmx.feature"/> + <import feature="org.jboss.tools.runtime.core.feature"/> </requires> <plugin Modified: trunk/as/features/org.jboss.tools.runtime.as.detector.feature/feature.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.as.detector.feature/feature.xml 2012-08-24 01:04:29 UTC (rev 43203) +++ trunk/as/features/org.jboss.tools.runtime.as.detector.feature/feature.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.runtime.as.detector.feature" label="%featureName" - version="1.4.0.qualifier" + version="2.4.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.runtime.as.detector"> Modified: trunk/as/features/org.jboss.tools.runtime.as.detector.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.as.detector.feature/pom.xml 2012-08-24 01:04:29 UTC (rev 43203) +++ trunk/as/features/org.jboss.tools.runtime.as.detector.feature/pom.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -3,11 +3,11 @@ 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> <parent> - <groupId>org.jboss.tools.runtime</groupId> + <groupId>org.jboss.tools.as</groupId> <artifactId>features</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.runtime.features</groupId> + <groupId>org.jboss.tools.as.features</groupId> <artifactId>org.jboss.tools.runtime.as.detector.feature</artifactId> <packaging>eclipse-feature</packaging> @@ -44,4 +44,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/as/features/pom.xml =================================================================== --- trunk/as/features/pom.xml 2012-08-30 10:19:33 UTC (rev 43320) +++ trunk/as/features/pom.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -19,7 +19,7 @@ <module>org.jboss.ide.eclipse.as.feature</module> <module>org.jboss.ide.eclipse.as.test.feature</module> - + <module>org.jboss.tools.runtime.as.detector.feature</module> </modules> </project> Modified: trunk/as/plugins/org.jboss.tools.runtime.as.detector/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/META-INF/MANIFEST.MF 2012-08-24 01:04:29 UTC (rev 43203) +++ trunk/as/plugins/org.jboss.tools.runtime.as.detector/META-INF/MANIFEST.MF 2012-08-30 10:39:06 UTC (rev 43321) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.runtime.as.detector;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 2.4.0.qualifier Bundle-Activator: org.jboss.tools.runtime.as.detector.RuntimeAsActivator Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", Modified: trunk/as/plugins/org.jboss.tools.runtime.as.detector/about.html =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/about.html 2012-08-24 01:04:29 UTC (rev 43203) +++ trunk/as/plugins/org.jboss.tools.runtime.as.detector/about.html 2012-08-30 10:39:06 UTC (rev 43321) @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>JBoss Runtime Detection</title> +<title>JBoss Runtime Application Server Detection</title> <style type="text/css" media="screen">  <feature url="features/org.jboss.tools.seam.feature.source_0.0.0.jar" id="org.jboss.tools.seam.feature.source" version="0.0.0"> <category name="JBoss Tools seam Nightly Build Update Site"/> @@ -18,4 +22,8 @@ <feature url="features/org.jboss.tools.seam.test.feature.source_0.0.0.jar" id="org.jboss.tools.seam.test.feature.source" version="0.0.0"> <category name="JBoss Tools seam Nightly Build Update Site"/> </feature> + <feature url="features/org.jboss.tools.runtime.seam.detector.feature.source_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature.source" version="0.0.0"> + <category name="JBoss Tools seam Nightly Build Update Site"/> + </feature> + </site> Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.classpath 2012-08-30 10:39:06 UTC (rev 43321) @@ -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/seam/tests/org.jboss.tools.runtime.seam.detector.test/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.project 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.runtime.seam.detector.test</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/seam/tests/org.jboss.tools.runtime.seam.detector.test/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/.settings/org.eclipse.jdt.core.prefs 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,8 @@ +#Thu Mar 24 21:12:52 CET 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/META-INF/MANIFEST.MF 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,41 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %BundleName +Bundle-SymbolicName: org.jboss.tools.runtime.seam.detector.test;singleton:=true +Bundle-Activator: org.jboss.tools.runtime.seam.detector.test.SeamRuntimeDetectorTestActivator +Bundle-Version: 3.4.0.qualifier +Require-Bundle: org.eclipse.core.runtime, + org.junit;bundle-version="4.8.1", + org.jboss.tools.runtime.ui, + org.jboss.tools.runtime.core, + org.jboss.tools.tests, + org.jboss.tools.seam.core, + org.eclipse.datatools.connectivity, + org.eclipse.datatools.connectivity.db.generic, + org.jboss.tools.common, + org.jboss.tools.tests, + org.jboss.ide.eclipse.as.core, + org.eclipse.wst.server.core, + org.eclipse.datatools.enablement.hsqldb, + org.eclipse.datatools.enablement.hsqldb.dbdefinition, + org.eclipse.datatools.enablement.hsqldb.ui, + org.eclipse.jst.jee, + org.eclipse.jst.jee.ejb, + org.eclipse.jst.jee.ui, + org.eclipse.jst.jee.web, + org.eclipse.ui, + org.eclipse.core.resources, + org.jboss.tools.jsf.vpe.seam, + org.jboss.tools.seam.pages.xml, + org.jboss.tools.seam.ui, + org.jboss.tools.seam.ui.pages, + org.jboss.tools.seam.xml, + org.jboss.tools.seam.xml.ui, + org.jboss.tools.seam.text.ext, + org.jboss.tools.runtime.as.detector;bundle-version="2.4.0", + org.jboss.tools.runtime.seam.detector;bundle-version="3.4.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: %BundleVendor +Bundle-Localization: plugin +Export-Package: org.jboss.tools.runtime.seam.detector.test Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/build.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/build.properties 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + plugin.xml +src.includes = * Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.properties 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,3 @@ +#Properties file for org.jboss.tools.project.examples +BundleVendor = JBoss by Red Hat +BundleName = JBoss Runtime Detection Tests \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> +</plugin> Property changes on: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/plugin.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/pom.xml (from rev 43260, trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml) =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/pom.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,156 @@ +<?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> + <parent> + <groupId>org.jboss.tools.seam</groupId> + <artifactId>tests</artifactId> + <version>3.4.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.seam.tests</groupId> + <artifactId>org.jboss.tools.runtime.seam.detector.test</artifactId> + + <packaging>eclipse-test-plugin</packaging> + + <properties> + <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirementsDirectory}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirementsDirectory}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirementsDirectory}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirementsDirectory}/jboss-eap-4.3 -Dskip.runtime.scanner=true -Djbosstools.test.jboss.home.7.0=${requirementsDirectory}/jboss-as-7.0.0.Final -Dorg.jboss.tools.tests.skipPrivateRequirements=${skipPrivateRequirements}</systemProperties> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>install-as</id> + <phase>pre-integration-test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-dist</artifactId> + <version>4.2.3.GA</version> + <type>zip</type> + </artifactItem> + <artifactItem> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-dist</artifactId> + <version>7.0.0.Final</version> + <type>zip</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.googlecode.maven-download-plugin</groupId> + <artifactId>maven-download-plugin</artifactId> + <executions> + <execution> + <id>install-as-5.1.0</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://repository.jboss.org/sourceforge/jboss-5.1.0.GA.zip</url> + <md5>78322c75ca0c13002a04418b4a8bc920</md5> + <unpack>true</unpack> + </configuration> + </execution> + <execution> + <id>install-seam-2.0.1</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://repository.jboss.org/sourceforge/jboss-seam-2.0.1.GA.zip</url> + <unpack>true</unpack> + <md5>0a1accf94fd37e40ab1091ee593b8b75</md5> + </configuration> + </execution> + <execution> + <id>install-seam-2.2.0</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://repository.jboss.org/sourceforge/jboss-seam-2.2.0.GA.zip</url> + <unpack>true</unpack> + <md5>febaf032f989240fe3828a8f0f7fe98a</md5> + </configuration> + </execution> + <execution> + <id>install-eap</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03/zip/jboss-eap-...</url> + <md5>18dc28785c8b156b36e2d92db699064a</md5> + <unpack>true</unpack> + <skip>${skipPrivateRequirements}</skip> + </configuration> + </execution> + <execution> + <id>install-eap-seam-gen</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://download.jboss.org/jbosstools/test-runtimes/rhds-seam-gen-patch.zip</url> + <md5>79b37541804f49844ea7322c0ff599c1</md5> + <unpack>true</unpack> + <outputDirectory>${requirementsDirectory}/jboss-eap-4.3/seam</outputDirectory> + <skip>${skipPrivateRequirements}</skip> + </configuration> + </execution> + <execution> + <id>install-eap-fp</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://download.devel.redhat.com/released/JBEAP-4.3.0/CP03_FP01/zip/jboss...</url> + <md5>38fe2a2a55edc5239ba680eff3b29533</md5> + <unpack>true</unpack> + <skip>${skipPrivateRequirements}</skip> + </configuration> + </execution> + <execution> + <id>install-seam-fp-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://download.jboss.org/jbosstools/test-runtimes/jbds-seamfp-patch.zip</url> + <md5>c3af3b56add0acccb72db88de477f3c7</md5> + <unpack>true</unpack> + <skip>${skipPrivateRequirements}</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <testSuite>org.jboss.tools.runtime.seam.detector.test</testSuite> + <testClass>org.jboss.tools.runtime.seam.detector.test.SeamRuntimeDetectionAllTests</testClass> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/IRuntimeDetectionConstants.java =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/IRuntimeDetectionConstants.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/IRuntimeDetectionConstants.java 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,32 @@ +/************************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.runtime.seam.detector.test; + +/** + * + * @author snjeza + * + */ +public interface IRuntimeDetectionConstants { + + final static String JBOSS_42_HOME = System.getProperty("jbosstools.test.jboss.home.4.2", "E:\\JBossRuntimes\\jboss-4.2.3.GA"); + + final static String JBOSS_51_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "E:\\JBossRuntime2\\jboss-5.1.0.GA"); + + final static String JBOSS_70_HOME = System.getProperty("jbosstools.test.jboss.home.7.0", "E:\\jboss-as-7.0.1.Final"); + + final static String SEAM_20_HOME = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\JBossRuntimes\\jboss-seam-2.0.1.GA"); + + final static String SEAM_22_HOME = System.getProperty("jbosstools.test.seam.2.2.0.GA.home", "E:\\JBossRuntime2\\jboss-seam-2.2.1.Final"); + + final static String EAP_43_HOME = System.getProperty("jbosstools.test.eap.4.3.home", "E:\\jboss-eap43_cp03"); + +} Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionAllTests.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionAllTests.java 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,23 @@ +/************************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.runtime.seam.detector.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +(a)RunWith(Suite.class) +@SuiteClasses({ + SeamRuntimeDetectionTest.class +}) +public class SeamRuntimeDetectionAllTests { + +} \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,424 @@ +/************************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.runtime.seam.detector.test; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.JarFile; + +import junit.framework.Assert; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IRuntimeType; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerCore; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.tools.runtime.as.detector.IJBossRuntimePluginConstants; +import org.jboss.tools.runtime.core.JBossRuntimeLocator; +import org.jboss.tools.runtime.core.RuntimeCoreActivator; +import org.jboss.tools.runtime.core.model.IRuntimeDetector; +import org.jboss.tools.runtime.core.model.RuntimeDefinition; +import org.jboss.tools.runtime.core.model.RuntimePath; +import org.jboss.tools.runtime.ui.RuntimeUIActivator; +import org.jboss.tools.seam.core.project.facet.SeamRuntime; +import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; +import org.jboss.tools.seam.core.project.facet.SeamVersion; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author snjeza + * @author rob stryker + */ +public class SeamRuntimeDetectionTest extends Assert implements IJBossRuntimePluginConstants { + private final static String seamVersionAttributeName = "Seam-Version"; + private final static String SKIP_PRIVATE = "org.jboss.tools.tests.skipPrivateRequirements"; + + @BeforeClass + public static void create() { + RuntimeCoreActivator.getDefault(); + RuntimeUIActivator.getDefault(); + } + + @Before + public void setUp() { + clearAll(); + } + @After + public void tearDown() { + clearAll(); + } + + public void clearAll() { + // remove all wtp servers + IServer[] s = ServerCore.getServers(); + for( int i = 0; i < s.length; i++ ) { + try { + s[i].delete(); + } catch(CoreException ce ) { + ce.printStackTrace(); + fail(); + } + } + + // Remove all wtp runtimes + IRuntime[] r = ServerCore.getRuntimes(); + for( int i = 0; i < r.length; i++ ) { + try { + r[i].delete(); + } catch(CoreException ce ) { + ce.printStackTrace(); + fail(); + } + } + // Remove all seam runtimes + SeamRuntime[] seamRuntimes = SeamRuntimeManager.getInstance().getRuntimes(); + for( int i = 0; i < seamRuntimes.length; i++ ) { + SeamRuntimeManager.getInstance().removeRuntime(seamRuntimes[i]); + } + SeamRuntimeManager.getInstance().save(); + } + + + @Test + public void testRuntimeDetectors() { + Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); + assertTrue("Runtime detectors don't exist.", detectors.size() > 0); + assertTrue(handlerExists("org.jboss.tools.runtime.handlers.SeamHandler")); + } + + private boolean handlerExists(String id) { + Set<IRuntimeDetector> detectors = RuntimeCoreActivator.getRuntimeDetectors(); + boolean found = false; + Iterator<IRuntimeDetector> i = detectors.iterator(); + while(i.hasNext()) { + IRuntimeDetector next = i.next(); + String nid = next.getId(); + if( id.equals(nid)) + found = true; + } + return found; + } + + @Test + public void testJBossAs42() { + testOneApplicationServer(IRuntimeDetectionConstants.JBOSS_42_HOME, IJBossToolingConstants.AS_42); + } + + @Test + public void testJBossAs51() { + testOneApplicationServer(IRuntimeDetectionConstants.JBOSS_51_HOME, IJBossToolingConstants.AS_51); + } + + @Test + public void testJBossAs70() { + testOneApplicationServer(IRuntimeDetectionConstants.JBOSS_70_HOME, IJBossToolingConstants.AS_70); + } + + public void testOneApplicationServer(String homeDir, String typeId) { + List<RuntimeDefinition> runtimeDefinitions = initializeOnePath(homeDir); + RuntimeDefinition def1 = runtimeDefinitions.get(0); + + def1.setEnabled(false); + initializeDefinitions(runtimeDefinitions); + int count = countRuntimesOfType(typeId); + assertEquals(0, count); + + def1.setEnabled(true); + initializeDefinitions(runtimeDefinitions); + count = countRuntimesOfType(typeId); + assertEquals(1, count); + } + + private List<RuntimeDefinition> initializeOnePath(String homeDir) { + RuntimePath path = createRuntimePath(homeDir, false); + setRuntimePaths(path, true); + File file = new File(path.getPath()); + assertTrue("The '" + file.getAbsolutePath() + "' path isn't valid.", file.isDirectory()); + + List<RuntimeDefinition> runtimeDefinitions = createDefinitionsForPath(path); + assertEquals(1, runtimeDefinitions.size()); + RuntimeDefinition def1 = runtimeDefinitions.get(0); + + File location = def1.getLocation(); + assertTrue("The '" + location.getAbsolutePath() + "' path isn't valid.", location.isDirectory()); + return runtimeDefinitions; + } + + + // 1.2 is bundled in eap ? + // public void testSeam12() { +// testOneSeamLocation(IRuntimeDetectionConstants., SeamVersion.SEAM_1_2, "1.2"); +// int count = countSeamRuntimesForVersion(SeamVersion.SEAM_1_2); +// assertEquals(1, count); +// } + + + @Test + public void testJBossEap43() { + if( Boolean.getBoolean(SKIP_PRIVATE)) + return; + + List<RuntimeDefinition> runtimeDefinitions = initializeOnePath(IRuntimeDetectionConstants.EAP_43_HOME); + RuntimeDefinition def1 = runtimeDefinitions.get(0); + + // Should setting this to false cascade to the nested definitions? + //def1.setEnabled(false); + setServerDefinitionsEnabledRecurse(def1, false); + initializeDefinitions(runtimeDefinitions); + int count = countRuntimesOfType(IJBossToolingConstants.EAP_43); + assertEquals(0, count); + count = countSeamRuntimesForVersion(SeamVersion.SEAM_1_2); + assertEquals(0, count); + + setServerDefinitionsEnabledRecurse(def1, true); + initializeDefinitions(runtimeDefinitions); + count = countRuntimesOfType(IJBossToolingConstants.EAP_43); + assertEquals(1, count); + count = countSeamRuntimesForVersion(SeamVersion.SEAM_1_2); + assertEquals(1, count); + } + private void setServerDefinitionsEnabledRecurse(RuntimeDefinition def, boolean enabled) { + def.setEnabled(enabled); + List<RuntimeDefinition> nested = def.getIncludedServerDefinitions(); + Iterator<RuntimeDefinition> i = nested.iterator(); + while(i.hasNext()) { + setServerDefinitionsEnabledRecurse(i.next(), enabled); + } + } + @Test + public void testSeam20() throws Exception { + testOneSeamLocation(IRuntimeDetectionConstants.SEAM_20_HOME, SeamVersion.SEAM_2_0, "2.0"); + } + + @Test + public void testSeam22() throws Exception { + testOneSeamLocation(IRuntimeDetectionConstants.SEAM_22_HOME, SeamVersion.SEAM_2_2, "2.2"); + } + + + public void testOneSeamLocation(String homeDir, SeamVersion version, String versionString) throws Exception { + testSeamHome(homeDir, versionString); + + List<RuntimeDefinition> runtimeDefinitions = initializeOnePath(homeDir); + RuntimeDefinition def1 = runtimeDefinitions.get(0); + + def1.setEnabled(false); + initializeDefinitions(runtimeDefinitions); + int count = countSeamRuntimesForVersion(version); + assertEquals(0, count); + + def1.setEnabled(true); + initializeDefinitions(runtimeDefinitions); + count = countSeamRuntimesForVersion(version); + assertEquals(1, count); + + List<RuntimeDefinition> nested = def1.getIncludedServerDefinitions(); + System.out.println(nested.size()); + } + + + private void testSeamHome(String seamHome, String seamVersion) throws IOException { + File file = new File(seamHome); + assertTrue("The '" + file.getAbsolutePath() + + "' path isn't valid.", file.isDirectory()); + String[] seamFiles = file.list(new FilenameFilter() { + + public boolean accept(File dir, String name) { + if ("seam-gen".equals(name)) { + return true; + } + if ("lib".equals(name)) { + return true; + } + return false; + } + }); + assertTrue("seamFiles : " + seamFiles, seamFiles != null + && seamFiles.length == 2); + File jarFile = new File(seamHome, "lib/jboss-seam.jar"); + assertTrue("The '" + jarFile.getAbsolutePath() + "' path isn't valid.", + jarFile.isFile()); + JarFile jar = new JarFile(jarFile); + Attributes attributes = jar.getManifest().getMainAttributes(); + String version = attributes.getValue(seamVersionAttributeName); + assertTrue("seamVersion: " + version, version != null && version.startsWith(seamVersion)); + } + + + + /* + * Utility methods for counting things + */ + + /* Pass to all handlers the list of runtime definitions and let them initialize them */ + private void initializeDefinitions(List<RuntimeDefinition> runtimeDefinitions) { + Set<IRuntimeDetector> detectors = RuntimeCoreActivator + .getRuntimeDetectors(); + for (IRuntimeDetector detector : detectors) { + if (detector.isEnabled()) { + detector.initializeRuntimes(runtimeDefinitions); + } + } + } + private List<RuntimeDefinition> createDefinitionsForPath(RuntimePath runtimePath) { + JBossRuntimeLocator locator = new JBossRuntimeLocator(); + List<RuntimeDefinition> serverDefinitions = locator + .searchForRuntimes(runtimePath.getPath(), + new NullProgressMonitor()); + + // Shouldn't this be done by the framework somehow?? + runtimePath.getServerDefinitions().clear(); + for (RuntimeDefinition serverDefinition : serverDefinitions) { + serverDefinition.setRuntimePath(runtimePath); + } + runtimePath.getServerDefinitions().addAll(serverDefinitions); + return serverDefinitions; + } + + private RuntimePath createRuntimePath(String path, boolean enableForStartup) { + RuntimePath runtimePath = new RuntimePath(path); + runtimePath.setScanOnEveryStartup(enableForStartup); + return runtimePath; + } + private void setRuntimePaths(RuntimePath runtimePath, boolean save) { + Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths(); + runtimePaths.clear(); + runtimePaths.add(runtimePath); + if( save ) + RuntimeUIActivator.getDefault().saveRuntimePaths(); + } + + + private int countSeamRuntimes() { + return SeamRuntimeManager.getInstance().getRuntimes().length; + } + private int countSeamRuntimesForVersion(SeamVersion version) { + SeamRuntime[] seamRuntimes = SeamRuntimeManager.getInstance().getRuntimes(); + int count = 0; + for (SeamRuntime seamRuntime : seamRuntimes) { + SeamVersion version2 = seamRuntime.getVersion(); + if (version.equals(version2)) { + count++; + } + } + return count; + } + + + private int countRuntimesOfType(String typeId) { + IRuntime[] runtimes = ServerCore.getRuntimes(); + int count = 0; + for (IRuntime runtime : runtimes) { + IRuntimeType runtimeType = runtime.getRuntimeType(); + if (typeId.equals(runtimeType.getId())) { + count++; + } + } + return count; + } + + public void testWtpRuntimes() { + IRuntime[] runtimes = ServerCore.getRuntimes(); + assertTrue("runtimes.length\nExpected: 4\nWas: " + runtimes.length, + runtimes.length == 4); + } + + public void testIncludedDefinitions() { + for (RuntimeDefinition serverDefinition:RuntimeUIActivator.getDefault().getServerDefinitions()){ + String type = serverDefinition.getType(); + if (EAP.equals(type)) { + assertTrue("EAP has to include server definitions", serverDefinition.getIncludedServerDefinitions().size() > 0); + for(RuntimeDefinition included:serverDefinition.getIncludedServerDefinitions()) { + assertTrue("Invalid parent definition", included.getParent() == serverDefinition); + } + } + } + } + + + + // Things to test in runtime core test suite, not here + +// +// @Test +// public void testSavePreferences() throws Exception { +// // saves preferences +// Bundle bundle = Platform.getBundle(RuntimeUIActivator.PLUGIN_ID); +// bundle.stop(); +// // loads preferences +// bundle.start(); +// // calls tests again +// testServerDefinitions(); +// testIncludedDefinitions(); +// testRuntimePaths(); +// testRuntimeDetectors(); +// testLocations(); +// testSeamRuntimes(); +// testWtpRuntimes(); +// testSeam22(); +// testSeam22Location(); +// } +// +// @Test +// public void testOldWorkspace() throws Exception { +// String runtimes = ConfigurationScope.INSTANCE.getNode( +// RuntimeUIActivator.PLUGIN_ID).get( +// RuntimeUIActivator.RUNTIME_PATHS, null); +// // removes version and included definitions +// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); +// Document doc = factory.newDocumentBuilder().parse(new InputSource(new StringReader(runtimes))); +// Element runtimePaths = (Element) doc.getElementsByTagName(RuntimeUIActivator.RUNTIME_PATHS).item(0); +// runtimePaths.removeAttribute(RuntimeUIActivator.PREFERENCES_VERSION); +// removeIncluded(doc); +// runtimes = serialize(doc); +// // restarts the bundle +// Bundle bundle = Platform.getBundle(RuntimeUIActivator.PLUGIN_ID); +// bundle.stop(); +// bundle.start(); +// // saves preferences +// ConfigurationScope.INSTANCE.getNode(RuntimeUIActivator.PLUGIN_ID).put( +// RuntimeUIActivator.RUNTIME_PATHS, runtimes); +// // calls tests again +// testIncludedDefinitions(); +// testServerDefinitions(); +// } +// +// private void removeIncluded(Node node) { +// if (node.getNodeType() == Node.ELEMENT_NODE +// && node.getNodeName().equals("included")) { +// node.getParentNode().removeChild(node); +// } else { +// NodeList list = node.getChildNodes(); +// for (int i = 0; i < list.getLength(); i++) { +// removeIncluded(list.item(i)); +// } +// } +// } +// +// private String serialize(Document doc) throws TransformerException { +// StringWriter stringWriter = new StringWriter(); +// Transformer serializer = TransformerFactory.newInstance().newTransformer(); +// serializer.transform(new DOMSource(doc), new StreamResult(stringWriter)); +// return stringWriter.toString(); +// } +} Added: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectorTestActivator.java =================================================================== --- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectorTestActivator.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectorTestActivator.java 2012-08-30 10:39:06 UTC (rev 43321) @@ -0,0 +1,45 @@ +package org.jboss.tools.runtime.seam.detector.test; + +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +public class SeamRuntimeDetectorTestActivator extends Plugin { + + // The shared instance + private static SeamRuntimeDetectorTestActivator plugin; + + + /** + * The constructor + */ + public SeamRuntimeDetectorTestActivator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static SeamRuntimeDetectorTestActivator getDefault() { + return plugin; + } + +} Modified: trunk/seam/tests/pom.xml =================================================================== --- trunk/seam/tests/pom.xml 2012-08-30 10:19:33 UTC (rev 43320) +++ trunk/seam/tests/pom.xml 2012-08-30 10:39:06 UTC (rev 43321) @@ -45,6 +45,7 @@ <module>org.jboss.tools.seamfp.core.test</module> <module>org.jboss.tools.seamfp.ui.test</module> + <module>org.jboss.tools.runtime.seam.detector.test</module> </modules> <properties>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43320 - trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2012-08-30 06:19:33 -0400 (Thu, 30 Aug 2012) New Revision: 43320 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF Log: Removed unused code Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2012-08-30 10:19:04 UTC (rev 43319) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2012-08-30 10:19:33 UTC (rev 43320) @@ -10,7 +10,6 @@ Export-Package: org.hibernate.console, org.hibernate.console.execution, org.hibernate.console.ext, - org.hibernate.console.ext.api, org.hibernate.console.node, org.hibernate.console.preferences, org.hibernate.eclipse,

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2012