Author: jlukas(a)redhat.com Date: 2010-10-26 06:36:35 -0400 (Tue, 26 Oct 2010) New Revision: 26061 Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf Removed: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java Log: move resources to a package Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-10-26 10:21:02 UTC (rev 26060) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-10-26 10:36:35 UTC (rev 26061) @@ -3,6 +3,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="resources"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties 2010-10-26 10:21:02 UTC (rev 26060) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties 2010-10-26 10:36:35 UTC (rev 26061) @@ -1,4 +1,4 @@ -source.. = src/,resources/ +source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-10-26 10:21:02 UTC (rev 26060) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-10-26 10:36:35 UTC (rev 26061) @@ -250,14 +250,14 @@ SWTBotEditor editor = packageExplorer.openFile(PROJECT_NAME, "JavaSource", "sample", "GetNameForm.java"); SWTBotEclipseEditor eeditor = editor.toTextEditor(); eeditor.selectRange(0, 0, eeditor.getText().length()); - eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GetNameForm.java.gf"))); + eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GetNameForm.java.gf"))); editor.saveAndClose(); //4.1.2. GreetingAction.java editor = packageExplorer.openFile(PROJECT_NAME, "JavaSource", "sample", "GreetingAction.java"); eeditor = editor.toTextEditor(); eeditor.selectRange(0, 0, eeditor.getText().length()); - eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GreetingAction.java.gf"))); + eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GreetingAction.java.gf"))); editor.saveAndClose(); //4.2.1. inputname.jsp @@ -275,7 +275,7 @@ editorA.selectTab("Source"); SWTBotStyledText st = editorA.bot().styledText(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname.jsp.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname.jsp.gf"))); editor.saveAndClose(); // st.navigateTo(7, 24); @@ -301,7 +301,7 @@ editorA.selectTab("Source"); st = editorA.bot().styledText(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/greeting.jsp.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/greeting.jsp.gf"))); editor.saveAndClose(); //4.2.3. index.jsp @@ -315,7 +315,7 @@ editorA.selectTab("Source"); st = bot.styledText(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/index.jsp.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/index.jsp.gf"))); editor.saveAndClose(); } @@ -420,7 +420,7 @@ jspEditor.selectTab("Source"); SWTBotStyledText st = jspEditor.bot().styledText(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname63.jsp.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname63.jsp.gf"))); jspEditor.save(); bot.editorByTitle("struts-config.xml").save(); util.waitForNonIgnoredJobs(); @@ -444,7 +444,7 @@ //6.5. Editing the JSP File jspEditor.show(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname65.jsp.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname65.jsp.gf"))); jspEditor.saveAndClose(); //6.6. Editing the Action @@ -465,7 +465,7 @@ editor.show(); st = editor.bot().styledText(); st.selectRange(0, 0, st.getText().length()); - st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GetNameForm67.java.gf"))); + st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GetNameForm67.java.gf"))); editor.saveAndClose(); new StrutsUIEditorBot(bot.editorByTitle("struts-config.xml").getReference()).show(); bot.activeShell().bot().menu("File").menu("Save All").click(); Copied: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources (from rev 26044, trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources) Deleted: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf 2010-10-26 04:25:09 UTC (rev 26044) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf 2010-10-26 10:36:35 UTC (rev 26061) @@ -1,24 +0,0 @@ -<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %> -<!-- -/******************************************************************************* - * Copyright (c) 2010 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ ---> -<html:html> - <head> - <html:javascript formName="GetNameForm"/> - <title></title> - </head> - <body> - <html:form action="/greeting.do" onsubmit="return validateGetNameForm(this)"> - Input name:<html:text property="name"/><html:submit value="Say Hello!"/> - </html:form> - </body> -</html:html> Copied: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf (from rev 26053, trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf) =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf (rev 0) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf 2010-10-26 10:36:35 UTC (rev 26061) @@ -0,0 +1,24 @@ +<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %> +<!-- +/******************************************************************************* + * Copyright (c) 2010 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +--> +<html:html> + <head> + <html:javascript formName="GetNameForm" /> + <title></title> + </head> + <body> + <html:form action="/greeting.do" onsubmit="return validateGetNameForm(this)"> + Input name:<html:text property="name"/><html:submit value="Say Hello!"/> + </html:form> + </body> +</html:html> Deleted: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties 2010-10-26 04:25:09 UTC (rev 26044) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties 2010-10-26 10:36:35 UTC (rev 26061) @@ -1 +0,0 @@ -JBossEap4.3Home=/opt/jboss-eap-4.3/jboss-as