Author: scabanovich Date: 2008-06-20 09:15:08 -0400 (Fri, 20 Jun 2008) New Revision: 8872 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/BaseBean.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/User.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.jboss.tools.jst.web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java Log: Since JSFKickStart1 was removed, tests using it failed. I have replaced references to it with JSFKickStartOldFormat, which earlier was created as its copy. Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.project 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.project 2008-06-20 13:15:08 UTC (rev 8872) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JSFKickStart1</name> + <name>JSFKickStartOldFormat</name> <comment></comment> <projects> </projects> Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.eclipse.wst.common.component 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.eclipse.wst.common.component 2008-06-20 13:15:08 UTC (rev 8872) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project-modules id="moduleCoreId" project-version="1.5.0"> -<wb-module deploy-name="JSFKickStart1"> +<wb-module deploy-name="JSFKickStartOldFormat"> <wb-resource deploy-path="/" source-path="/WebContent"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> -<property name="context-root" value="JSFKickStart1"/> +<property name="context-root" value="JSFKickStartOldFormat"/> <property name="java-output-path" value="build/classes"/> </wb-module> </project-modules> Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.jboss.tools.jst.web.xml 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/.settings/org.jboss.tools.jst.web.xml 2008-06-20 13:15:08 UTC (rev 8872) @@ -30,7 +30,7 @@ <FILESYSTEM ENTITY="FileSystemJar" INFO="hidden=yes" LOCATION="%redhat.workspace%/lib/standard.jar" NAME="lib-standard.jar"/> <FILESYSTEM ENTITY="FileSystemFolder" - LOCATION="%eclipse.project%" NAME="JSFKickStart1"/> + LOCATION="%eclipse.project%" NAME="JSFKickStartOldFormat"/> <WEB ENTITY="JstWeb" MODEL_PATH="/web.xml" SERVLET_VERSION="2.4"> <MODULE ENTITY="WebJSFModule" MODEL_PATH="/faces-config.xml" ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/BaseBean.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/BaseBean.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/BaseBean.java 2008-06-20 13:15:08 UTC (rev 8872) @@ -0,0 +1,11 @@ +package demo; + +public class BaseBean { + + public String getParent() { + return ""; + } + + public void fuck() {} + +} Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/User.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/User.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/JavaSource/demo/User.java 2008-06-20 13:15:08 UTC (rev 8872) @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Developer Studio + */ +public class User extends BaseBean { + + private String name; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User Name + */ + public void setName(String name) { + this.name = name; + } + + public void getX1() { + + } + + public String getX2(int i) { + return ""; + } + + public void setX3(int i, int j) { + + } +} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/web.xml 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/web.xml 2008-06-20 13:15:08 UTC (rev 8872) @@ -1,7 +1,7 @@ <?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"> - <display-name>JSFKickStart1</display-name> + <display-name>JSFKickStartOldFormat</display-name> <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-06-20 13:15:08 UTC (rev 8872) @@ -27,7 +27,7 @@ public JSFBeansTest() {} public void setUp() throws CoreException { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStart1", false); + provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStartOldFormat", false); project = provider.getProject(); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-06-20 13:15:08 UTC (rev 8872) @@ -25,7 +25,7 @@ File projectLocation = null; public void setUp() throws Exception { - init("org.jboss.tools.jsf.test", "/projects", "JSFKickStart1"); + init("org.jboss.tools.jsf.test", "/projects", "JSFKickStartOldFormat"); } public void testImportWithoutLinks() { @@ -46,7 +46,7 @@ JUnitUtils.fail("Error in import operation", ex); } - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("JSFKickStart1"); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("JSFKickStartOldFormat"); assertTrue("Project was not loaded", p != null); File f = new File(p.getLocation().toFile(), ".project"); Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2008-06-20 12:33:01 UTC (rev 8871) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2008-06-20 13:15:08 UTC (rev 8872) @@ -34,7 +34,7 @@ public JSFModelTest() {} public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStart1", false); + provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSFKickStartOldFormat", false); project = provider.getProject(); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); }