Author: dgolovin Date: 2008-01-29 03:38:52 -0500 (Tue, 29 Jan 2008) New Revision: 6004 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml Log: fix test errors java.lang.NullPointerException at org.jboss.tools.seam.core.project.facet.SeamRuntimeManager.getDefaultRuntimeForProject(SeamRuntimeManager.java:256) at org.jboss.tools.seam.internal.core.SeamProject.getRuntime(SeamProject.java:171) at org.jboss.tools.seam.internal.core.SeamProject.getRuntimeName(SeamProject.java:152) at org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation.validate(SeamRuntimeValidation.java:36) there is no concept 'deaultSeamRuntime' for seam project Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component 2008-01-28 21:53:54 UTC (rev 6003) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component 2008-01-29 08:38:52 UTC (rev 6004) @@ -3,7 +3,6 @@ <wb-module deploy-name="SeamWebWarTestProject"> <wb-resource deploy-path="/" source-path="/WebContent"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/action"/> -<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/model"/> <property name="context-root" value="SeamWebWarTestProject"/> <property name="java-output-path" value="build/classes"/> </wb-module> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml 2008-01-28 21:53:54 UTC (rev 6003) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml 2008-01-29 08:38:52 UTC (rev 6004) @@ -1,52 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> -<file-systems application-name="Test1" model-entity="FileSystems" - VERSION="2.0.0" WORKSPACE_HOME="./WebContent/WEB-INF"> - <file-system model-entity="FileSystemFolder" location="%workspace.home%" NAME="WEB-INF"/> - <file-system model-entity="FileSystemFolder" INFO="Content-Type=Web" - location="%workspace.home%/.." NAME="WEB-ROOT"/> - <file-system model-entity="FileSystemFolder" - location="%workspace.home%/../../src" NAME="src"/> - <file-system model-entity="FileSystemFolder" location="%workspace.home%/lib" NAME="lib"/> - <file-system model-entity="FileSystemFolder" - location="%workspace.home%/classes" NAME="classes"/> - <file-system model-entity="FileSystemJar" - location="C:\Program Files\Java\jre1.5.0_06\lib\ext\dnsns.jar" NAME="lib-dnsns.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Program Files\Java\jre1.5.0_06\lib\ext\localedata.jar" NAME="lib-localedata.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Program Files\Java\jre1.5.0_06\lib\ext\sunjce_provider.jar" NAME="lib-sunjce_provider.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Program Files\Java\jre1.5.0_06\lib\ext\sunpkcs11.jar" NAME="lib-sunpkcs11.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\ajax4jsf-1.1.1-SNAPSHOT.jar" NAME="lib-ajax4jsf-1.1.1-SNAPSHOT.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-beanutils-1.7.0.jar" NAME="lib-commons-beanutils-1.7.0.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-collections-3.1.jar" NAME="lib-commons-collections-3.1.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-digester-1.6.jar" NAME="lib-commons-digester-1.6.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-debug.jar" NAME="lib-jboss-seam-debug.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ioc.jar" NAME="lib-jboss-seam-ioc.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-mail.jar" NAME="lib-jboss-seam-mail.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-pdf.jar" NAME="lib-jboss-seam-pdf.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-remoting.jar" NAME="lib-jboss-seam-remoting.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ui.jar" NAME="lib-jboss-seam-ui.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jsf-facelets.jar" NAME="lib-jsf-facelets.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\oscache-2.3.2.jar" NAME="lib-oscache-2.3.2.jar"/> - <file-system model-entity="FileSystemJar" - location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1-ear\EarContent\jboss-seam.jar" NAME="lib-jboss-seam.jar"/> - <file-system model-entity="FileSystemJar" - location="%workspace.home%/lib/ajax4jsf-1.1.1-snapshot.jar" NAME="lib-ajax4jsf-1.1.1-snapshot.jar"/> - <WEB model-entity="JstWeb" MODEL_PATH="/web.xml" SERVLET_VERSION="2.4"> - <MODULE model-entity="WebJSFModule" MODEL_PATH="/faces-config.xml" - ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/> - </WEB> +<file-systems VERSION="2.0.0" application-name="Test1" + model-entity="FileSystems" workspace-home="./WebContent/WEB-INF"> + <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/> + <file-system NAME="WEB-ROOT" info="Content-Type=Web" + location="%workspace.home%/.." model-entity="FileSystemFolder"/> + <file-system NAME="src" location="%workspace.home%/../../src" model-entity="FileSystemFolder"/> + <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/> + <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/> + <file-system NAME="lib-ajax4jsf-1.1.1-SNAPSHOT.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\ajax4jsf-1.1.1-SNAPSHOT.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-beanutils-1.7.0.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-collections-3.1.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-digester-1.6.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-digester-1.6.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-debug.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-debug.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-ioc.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ioc.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-mail.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-mail.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-pdf.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-pdf.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-remoting.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-remoting.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam-ui.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ui.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-facelets.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jsf-facelets.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-oscache-2.3.2.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\oscache-2.3.2.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-seam.jar" + location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1-ear\EarContent\jboss-seam.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-ajax4jsf-1.1.1-snapshot.jar" + location="%workspace.home%/lib/ajax4jsf-1.1.1-snapshot.jar" model-entity="FileSystemJar"/> + <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml"> + <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" + model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/> + </web> </file-systems> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-28 21:53:54 UTC (rev 6003) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-29 08:38:52 UTC (rev 6004) @@ -5,7 +5,7 @@ <fixed facet="jst.seam"/> <fixed facet="jst.java"/> <installed facet="jst.java" version="5.0"/> - <installed facet="jst.web" version="2.4"/> + <installed facet="jst.web" version="2.5"/> <installed facet="jst.jsf" version="1.2"/> <installed facet="jst.seam" version="1.2"/> </faceted-project> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml 2008-01-28 21:53:54 UTC (rev 6003) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml 2008-01-29 08:38:52 UTC (rev 6004) @@ -1,39 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> -<file-systems application-name="TestScanner" model-entity="FileSystems" - VERSION="2.0.0" WORKSPACE_HOME="./WebContent/WEB-INF"> - <file-system model-entity="FileSystemFolder" location="%redhat.workspace%" NAME="WEB-INF"/> - <file-system model-entity="FileSystemFolder" INFO="Content-Type=Web" - location="%redhat.workspace%/.." NAME="WEB-ROOT"/> - <file-system model-entity="FileSystemFolder" - location="%redhat.workspace%/../../JavaSource" NAME="src"/> - <file-system model-entity="FileSystemFolder" location="%redhat.workspace%/lib" NAME="lib"/> - <file-system model-entity="FileSystemFolder" - location="%redhat.workspace%/classes" NAME="classes"/> - <file-system model-entity="FileSystemFolder" - location="%redhat.workspace%/../../ant" NAME="build"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/common-annotations.jar" NAME="lib-common-annotations.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/commons-beanutils.jar" NAME="lib-commons-beanutils.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/commons-collections.jar" NAME="lib-commons-collections.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/commons-digester.jar" NAME="lib-commons-digester.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/commons-logging.jar" NAME="lib-commons-logging.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/jsf-api.jar" NAME="lib-jsf-api.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/jsf-impl.jar" NAME="lib-jsf-impl.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/jstl.jar" NAME="lib-jstl.jar"/> - <file-system model-entity="FileSystemJar" INFO="hidden=yes" - location="%redhat.workspace%/lib/standard.jar" NAME="lib-standard.jar"/> - <file-system model-entity="FileSystemFolder" location="%eclipse.project%" NAME="TestScanner"/> - <file-system model-entity="FileSystemJar" - location="%redhat.workspace%/lib/jboss-seam.jar" NAME="lib-jboss-seam.jar"/> - <WEB model-entity="JstWeb" MODEL_PATH="/web.xml" SERVLET_VERSION="2.4"> - <MODULE model-entity="WebJSFModule" MODEL_PATH="/faces-config.xml" - ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/> - </WEB> +<file-systems VERSION="2.0.0" application-name="TestScanner" + model-entity="FileSystems" workspace-home="./WebContent/WEB-INF"> + <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/> + <file-system NAME="WEB-ROOT" info="Content-Type=Web" + location="%workspace.home%/.." model-entity="FileSystemFolder"/> + <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/> + <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/> + <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/> + <file-system NAME="build" location="%workspace.home%/../../ant" model-entity="FileSystemFolder"/> + <file-system NAME="lib-common-annotations.jar" info="hidden=yes" + location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-collections.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-digester.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-logging.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-api.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-api.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-impl.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-impl.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jstl.jar" info="hidden=yes" + location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-standard.jar" info="hidden=yes" + location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/> + <file-system NAME="TestScanner" location="%eclipse.project%" model-entity="FileSystemFolder"/> + <file-system NAME="lib-jboss-seam.jar" + location="%workspace.home%/lib/jboss-seam.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-ejb3-persistence.jar" + location="%workspace.home%/lib/ejb3-persistence.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jboss-ejb3x.jar" + location="%workspace.home%/lib/jboss-ejb3x.jar" model-entity="FileSystemJar"/> + <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml"> + <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" + model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/> + </web> </file-systems> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml 2008-01-28 21:53:54 UTC (rev 6003) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml 2008-01-29 08:38:52 UTC (rev 6004) @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>TestScanner</display-name> <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name>