Author: dgolovin Date: 2010-05-27 19:25:20 -0400 (Thu, 27 May 2010) New Revision: 22397 Removed: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-api.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-impl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests tycho related manifest errors fixed to let it find tests in test plug-ins test project adjusted to have only resources relevant for test Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -4,7 +4,6 @@ Bundle-SymbolicName: org.jboss.tools.jst.web.kb;singleton:=true Bundle-Localization: plugin Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: webKb.jar Bundle-Activator: org.jboss.tools.jst.web.kb.WebKbPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,11 +1,11 @@ bin.includes = plugin.xml,\ META-INF/,\ plugin.properties,\ - webKb.jar,\ + .,\ about.html,\ schema/,\ taglibs/ -source.webKb.jar = src/,\ - resources/ -output.webKb.jar = bin/ -jars.compile.order = webKb.jar +source.. = src/,\ + resources/ +output.. = bin/ +jars.compile.order = . Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -4,7 +4,6 @@ Bundle-SymbolicName: org.jboss.tools.jst.css.test;singleton:=true Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.jboss.tools.jst.css.test.CSSTestPlugin -Bundle-ClassPath: css-test.jar Require-Bundle: org.eclipse.core.runtime, org.junit, org.jboss.tools.tests, Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,7 +1,6 @@ bin.includes = META-INF/,\ - css-test.jar,\ plugin.properties,\ resources/ -source.css-test.jar = src/ -jars.compile.order = css-test.jar -output.css-test.jar = bin/ +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -15,11 +15,11 @@ org.jboss.tools.jst.jsp, org.jboss.tools.common.text.ext, org.jboss.tools.jst.web, - org.jboss.tools.common.text.xml;bundle-version="2.0.0" + org.jboss.tools.common.text.xml;bundle-version="2.0.0", + org.jboss.tools.jst.web.kb;bundle-version="3.1.0" Export-Package: org.jboss.tools.jst.jsp.test, org.jboss.tools.jst.jsp.test.ca -Bundle-ClassPath: jst-jsp-test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,5 +1,5 @@ bin.includes = META-INF/,\ projects/,\ - jst-jsp-test.jar,\ + .,\ plugin.properties -source.jst-jsp-test.jar = src/ +source.. = src/ Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -15,4 +15,3 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.kb.test -Bundle-ClassPath: jst-web-kb-tests.jar Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,11 +1,11 @@ output.. = bin/ bin.includes = META-INF/,\ projects/,\ - jst-web-kb-tests.jar,\ + .,\ plugin.properties src.includes = src/,\ projects/,\ build.properties,\ META-INF/ -source.jst-web-kb-tests.jar = src/ +source.. = src/ additional.bundles = org.jboss.tools.common.model Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.project 2010-05-27 23:25:20 UTC (rev 22397) @@ -6,11 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.wst.common.project.facet.core.builder</name> <arguments> </arguments> @@ -21,16 +16,6 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.jboss.tools.common.verification.verifybuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.jboss.tools.jst.web.kb.kbbuilder</name> <arguments> </arguments> @@ -42,7 +27,6 @@ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.jboss.tools.jsf.jsfnature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.jboss.tools.jst.web.kb.kbnature</nature> </natures> </projectDescription> Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/index.jsp 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,7 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> - -<html> - <body> - <jsp:forward page="/pages/inputUserName.jsf" /> - </body> -</html> \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/hello.jsp 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,20 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> - -<f:loadBundle var="Message" basename="demo.Messages" /> - -<html> - <head> - <title>Hello!</title> - </head> - - <body> - <f:view> - <h3> - <h:outputText value="#{Message.hello_message}" />, - <h:outputText value="#{user.name}" />! - </h3> - </f:view> - </body> - -</html> \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-05-27 23:25:20 UTC (rev 22397) @@ -55,47 +55,14 @@ return kbProject; } - public void testXMLScanner() { + public void testTldXMLScanner() { IKbProject kbProject = getKbProject(); IFile f = project.getFile("WebContent/WEB-INF/faces-config.xml"); assertNotNull(f); XMLScanner scanner = new XMLScanner(); List<ITagLibrary> ls = null; - try { - LoadedDeclarations ds = scanner.parse(f, kbProject); - ls = ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - ls = null; - f = project.getFile("WebContent/facelet-taglib.xml"); - assertNotNull(f); - try { - LoadedDeclarations ds = scanner.parse(f, kbProject); - ls = ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - - ls = null; - f = project.getFile("WebContent/facelet-taglib2.xml"); - assertNotNull(f); - try { - LoadedDeclarations ds = scanner.parse(f, kbProject); - ls = ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - - ls = null; f = project.getFile("WebContent/WEB-INF/taglib2.tld"); assertNotNull(f); try { @@ -113,15 +80,15 @@ // } } - public void testKbProjectObjects() { + public void toDoTestKbProjectObjects() { } - public void testXMLSerialization() { + public void toDoXMLSerialization() { } - public void testCleanBuild() { + public void toDoCleanBuild() { } Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -9,6 +9,5 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.test -Bundle-ClassPath: jst-web-tests.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,10 +1,10 @@ output.. = bin/ bin.includes = META-INF/,\ projects/,\ - jst-web-tests.jar,\ + .,\ plugin.properties src.includes = src/,\ projects/,\ build.properties,\ META-INF/ -source.jst-web-tests.jar = src/ +source.. = src/ Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-05-27 23:25:20 UTC (rev 22397) @@ -12,6 +12,5 @@ org.jboss.tools.tests, org.eclipse.ui.ide Export-Package: org.jboss.tools.jst.web.ui.test -Bundle-ClassPath: jst-web-ui.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,6 +1,6 @@ output.. = bin/ bin.includes = META-INF/,\ - jst-web-ui.jar,\ + .,\ plugin.properties,\ projects/ -source.jst-web-ui.jar = src/ +source.. = src/