Author: dgolovin Date: 2011-12-30 16:38:22 -0500 (Fri, 30 Dec 2011) New Revision: 37602 Removed: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name Modified: trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java trunk/jsf/tests/pom.xml Log: removed jsf.test dependency from jsf.ui.test plugin to avoid skipping tests from jsf.ui.test in case of test errors in jsf.test Modified: trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/features/org.jboss.tools.jsf.test.feature/feature.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,29 +1,105 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.tools.jsf.test.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider"> +<feature + id="org.jboss.tools.jsf.test.feature" + label="%featureName" + version="3.3.0.qualifier" + provider-name="%featureProvider"> - <description> + <description> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="%licenseURL"> + <license url="%licenseURL"> %license </license> - <plugin id="org.jboss.tools.jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.text.ext.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.ui.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.verification.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.ajax4jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.facelets.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jbpm.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jsf.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.jstl.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.myfaces.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.richfaces.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.jsf.vpe.seam.test" download-size="0" install-size="0" version="0.0.0" /> + <plugin + id="org.jboss.tools.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui.bot.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.verification.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jbpm.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jstl.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam.test" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.base.test" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/build.properties 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,7 +1,4 @@ -source.. = -output.. = bin/ bin.includes = META-INF/,\ - .,\ toc.xml,\ plugin.xml,\ doc.zip,\ @@ -11,3 +8,17 @@ PaletteContextHelp.xml,\ JSFContextHelp.xml,\ plugin.properties +jars.compile.order = +src.includes = JSFContextHelp.xml,\ + .project,\ + META-INF/,\ + PaletteContextHelp.xml,\ + StrutsContextHelp.xml,\ + TilesContextHelp.xml,\ + VPEContextHelp.xml,\ + doc.zip,\ + plugin.properties,\ + plugin.xml,\ + plugin_ja.properties,\ + pom.xml,\ + toc.xml Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-12-30 21:38:22 UTC (rev 37602) @@ -2,6 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jsf.test;singleton:=true +Eclipse-BundleShape: dir Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: lib/xmlunit1.0.jar, . @@ -45,7 +46,8 @@ org.eclipse.jst.jsf.common, org.jboss.tools.jst.web.kb.test, org.jboss.tools.common.validation, - org.jboss.tools.common.base.test + org.jboss.tools.common.base.test, + org.jboss.tools.jsf.base.test;bundle-version="3.3.0" Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -15,18 +15,4 @@ <emma.filter>org.jboss.tools.jsf*</emma.filter> <emma.instrument.bundles>org.jboss.tools.jsf</emma.instrument.bundles> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <configuration> - <explodedBundles combine.children="append"> - <bundle>org.jboss.tools.jsf.test</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -43,7 +43,7 @@ TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName()); jsf2.addTestSuite(JSF2ModelTest.class); ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2, - "org.jboss.tools.jsf.test", + "org.jboss.tools.jsf.base.test", new String[]{"projects/JSF2Beans", "projects/JSF2Web"}, new String[]{"JSF2Beans", "JSF2Web"}); suite.addTest(testSetup); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.jsf.ui.test +Bundle-SymbolicName: org.jboss.tools.jsf.ui.test;singleton:=true Bundle-Version: 3.3.0.qualifier +Eclipse-BundleShape: dir Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.junit, org.jboss.tools.tests, @@ -28,7 +29,6 @@ org.jboss.tools.jst.web, org.jboss.tools.jst.web.kb, org.jboss.tools.jsf, - org.jboss.tools.jsf.test, org.eclipse.jst.standard.schemas, org.jboss.tools.vpe.ui.palette, org.eclipse.gef, @@ -40,6 +40,7 @@ org.jboss.tools.common.el.ui, org.eclipse.jdt.ui, org.jboss.tools.common.ui, - org.jboss.tools.common.gef + org.jboss.tools.common.gef, + org.jboss.tools.jsf.base.test;bundle-version="3.3.0" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2011-12-30 21:38:22 UTC (rev 37602) @@ -2,6 +2,7 @@ bin.includes = META-INF/,\ plugin.properties,\ projects/,\ - . + .,\ + plugin.xml jars.compile.order = . source.. = src/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.classpath 2011-12-30 21:38:22 UTC (rev 37602) @@ -3,13 +3,8 @@ <classpathentry kind="src" path="JavaSource"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> - <attribute name="owner.project.facets" value="jst.web"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"> - <attributes> <attribute name="owner.project.facets" value="jst.java"/> </attributes> </classpathentry> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-12-30 21:38:22 UTC (rev 37602) @@ -20,11 +20,6 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/.jsdtscope 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="Apache Tomcat v6.0"/> <fixed facet="jst.web"/> <fixed facet="jst.java"/> <installed facet="jst.java" version="5.0"/> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -Window \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.classpath 2011-12-30 21:38:22 UTC (rev 37602) @@ -3,15 +3,10 @@ <classpathentry kind="src" path="JavaSource"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> - <attribute name="owner.project.facets" value="jst.web"/> + <attribute name="owner.project.facets" value="java"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"> - <attributes> - <attribute name="owner.project.facets" value="jst.java"/> - </attributes> - </classpathentry> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> </classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-12-30 21:38:22 UTC (rev 37602) @@ -20,11 +20,6 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/.jsdtscope 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> - <runtime name="Apache Tomcat v6.0"/> <fixed facet="jst.java"/> <fixed facet="jst.web"/> <installed facet="jst.java" version="5.0"/> Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-30 21:38:22 UTC (rev 37602) @@ -1 +0,0 @@ -Window \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansInJavaTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -21,7 +21,7 @@ @Override public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy); + provider = new TestProjectProvider("org.jboss.tools.jsf.base.test", null, PROJECT_NAME, makeCopy); project = provider.getProject(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -10,7 +10,7 @@ private static final String PAGE_NAME = "/src/test/beans/inputname.xhtml"; public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy); + provider = new TestProjectProvider("org.jboss.tools.jsf.base.test", null, PROJECT_NAME, makeCopy); project = provider.getProject(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -134,17 +134,17 @@ new String[] { "JsfJbide1704Test" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - ELTooltipTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + ELTooltipTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAForELJavaAndJSTCompareTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ @@ -154,16 +154,15 @@ new String[] { "Jbide3845Test" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite( - CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ -// return new TestWizardsProject(suite); return suite; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NaturesInfoDialogTest.java 2011-12-30 21:38:22 UTC (rev 37602) @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; @@ -41,6 +42,7 @@ protected NaturesInfoDialogTest(String name) { super(name); + JsfUiPlugin.getDefault(); } protected final class ResultObject { @@ -117,8 +119,6 @@ isCheckNeed = false; assertNotNull("Editor is not opened", part); //$NON-NLS-1$ - - TestUtil.delay(3000); } Modified: trunk/jsf/tests/pom.xml =================================================================== --- trunk/jsf/tests/pom.xml 2011-12-30 20:38:37 UTC (rev 37601) +++ trunk/jsf/tests/pom.xml 2011-12-30 21:38:22 UTC (rev 37602) @@ -47,6 +47,7 @@ <module>org.jboss.tools.jsf.vpe.myfaces.test</module> <module>org.jboss.tools.jsf.vpe.richfaces.test</module> <module>org.jboss.tools.jsf.vpe.seam.test</module> + <module>org.jboss.tools.jsf.base.test</module> </modules> </profile>