Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java (original) +++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java Tue May 6 11:51:27 2008 @@ -66,15 +66,15 @@ public static final String SUBMIT = "//[EMAIL PROTECTED]'submit']"; - private final String _webappRoot; + private final String webappRoot; private final String _seleniumBrowserCommand; - private JettyRunner _jettyRunner; + private JettyRunner jettyRunner; - private Selenium _selenium; + private Selenium selenium; - private SeleniumServer _server; + private SeleniumServer server; /** * Initializes the suite using [EMAIL PROTECTED] #DEFAULT_WEB_APP_ROOT}. @@ -99,13 +99,13 @@ */ protected AbstractIntegrationTestSuite(String webAppRoot, String browserCommand) { - _webappRoot = webAppRoot; + webappRoot = webAppRoot; _seleniumBrowserCommand = browserCommand; } protected final void assertSourcePresent(String... expected) { - String source = _selenium.getHtmlSource(); + String source = selenium.getHtmlSource(); for (String snippet : expected) { @@ -134,7 +134,7 @@ catch (RuntimeException ex) { System.err.printf("Error accessing %s: %s, in:\n\n%s\n\n", locator, ex.getMessage(), - _selenium.getHtmlSource()); + selenium.getHtmlSource()); throw ex; } @@ -164,7 +164,7 @@ catch (RuntimeException ex) { System.err.printf("Error accessing %s: %s, in:\n\n%s\n\n", locator, ex.getMessage(), - _selenium.getHtmlSource()); + selenium.getHtmlSource()); throw ex; } @@ -183,7 +183,7 @@ { if (isTextPresent(item)) return; - System.err.printf("Text pattern '%s' not found in:\n%s\n\n", item, _selenium + System.err.printf("Text pattern '%s' not found in:\n%s\n\n", item, selenium .getHtmlSource()); throw new AssertionError("Page did not contain '" + item + "'."); @@ -212,14 +212,14 @@ } protected final void assertAttributeSeries(String idFormat, int startIndex, String... values) - { - for (int i = 0; i < values.length; i++) - { - String id = String.format(idFormat, startIndex + i); - - assertAttribute(id, values[i]); - } - } + { + for (int i = 0; i < values.length; i++) + { + String id = String.format(idFormat, startIndex + i); + + assertAttribute(id, values[i]); + } + } protected final void assertFieldValueSeries(String idFormat, int startIndex, String... values) @@ -235,623 +235,623 @@ @AfterClass(alwaysRun = true) public void cleanup() throws Exception { - _selenium.stop(); - _selenium = null; + selenium.stop(); + selenium = null; - _server.stop(); - _server = null; + server.stop(); + server = null; - _jettyRunner.stop(); - _jettyRunner = null; + jettyRunner.stop(); + jettyRunner = null; } @BeforeClass(alwaysRun = true) public void setup() throws Exception { - _jettyRunner = new JettyRunner(TapestryTestConstants.MODULE_BASE_DIR, "/", JETTY_PORT, _webappRoot); + jettyRunner = new JettyRunner(TapestryTestConstants.MODULE_BASE_DIR, "/", JETTY_PORT, webappRoot); - _server = new SeleniumServer(); + server = new SeleniumServer(); - _server.start(); + server.start(); CommandProcessor cp = new HttpCommandProcessor("localhost", SeleniumServer.DEFAULT_PORT, _seleniumBrowserCommand, BASE_URL); - _selenium = new DefaultSelenium(new ErrorReportingCommandProcessor(cp)); + selenium = new DefaultSelenium(new ErrorReportingCommandProcessor(cp)); - _selenium.start(); + selenium.start(); } public void addSelection(String locator, String optionLocator) { - _selenium.addSelection(locator, optionLocator); + selenium.addSelection(locator, optionLocator); } public void answerOnNextPrompt(String answer) { - _selenium.answerOnNextPrompt(answer); + selenium.answerOnNextPrompt(answer); } public void check(String locator) { - _selenium.check(locator); + selenium.check(locator); } public void chooseCancelOnNextConfirmation() { - _selenium.chooseCancelOnNextConfirmation(); + selenium.chooseCancelOnNextConfirmation(); } public void chooseOkOnNextConfirmation() { - _selenium.chooseOkOnNextConfirmation(); + selenium.chooseOkOnNextConfirmation(); } public void click(String locator) { - _selenium.click(locator); + selenium.click(locator); } public void doubleClick(String locator) { - _selenium.doubleClick(locator); + selenium.doubleClick(locator); } public void clickAt(String locator, String coordString) { - _selenium.clickAt(locator, coordString); + selenium.clickAt(locator, coordString); } public void doubleClickAt(String locator, String coordString) { - _selenium.doubleClickAt(locator, coordString); + selenium.doubleClickAt(locator, coordString); } public void close() { - _selenium.close(); + selenium.close(); } public void fireEvent(String locator, String eventName) { - _selenium.fireEvent(locator, eventName); + selenium.fireEvent(locator, eventName); } public String getAlert() { - return _selenium.getAlert(); + return selenium.getAlert(); } public String[] getAllButtons() { - return _selenium.getAllButtons(); + return selenium.getAllButtons(); } public String[] getAllFields() { - return _selenium.getAllFields(); + return selenium.getAllFields(); } public String[] getAttributeFromAllWindows(String attributeName) { - return _selenium.getAttributeFromAllWindows(attributeName); + return selenium.getAttributeFromAllWindows(attributeName); } public void dragdrop(String locator, String movementsString) { - _selenium.dragdrop(locator, movementsString); + selenium.dragdrop(locator, movementsString); } public void setMouseSpeed(String pixels) { - _selenium.setMouseSpeed(pixels); + selenium.setMouseSpeed(pixels); } public Number getMouseSpeed() { - return _selenium.getMouseSpeed(); + return selenium.getMouseSpeed(); } public void dragAndDrop(String locator, String movementsString) { - _selenium.dragAndDrop(locator, movementsString); + selenium.dragAndDrop(locator, movementsString); } public void dragAndDropToObject(String locatorOfObjectToBeDragged, String locatorOfDragDestinationObject) { - _selenium.dragAndDropToObject(locatorOfObjectToBeDragged, locatorOfDragDestinationObject); + selenium.dragAndDropToObject(locatorOfObjectToBeDragged, locatorOfDragDestinationObject); } public void windowFocus() { - _selenium.windowFocus(); + selenium.windowFocus(); } public void windowMaximize() { - _selenium.windowMaximize(); + selenium.windowMaximize(); } public String[] getAllWindowIds() { - return _selenium.getAllWindowIds(); + return selenium.getAllWindowIds(); } public String[] getAllWindowNames() { - return _selenium.getAllWindowNames(); + return selenium.getAllWindowNames(); } public String[] getAllWindowTitles() { - return _selenium.getAllWindowTitles(); + return selenium.getAllWindowTitles(); } public String[] getAllLinks() { - return _selenium.getAllLinks(); + return selenium.getAllLinks(); } public String getAttribute(String attributeLocator) { - return _selenium.getAttribute(attributeLocator); + return selenium.getAttribute(attributeLocator); } public String getBodyText() { - return _selenium.getBodyText(); + return selenium.getBodyText(); } public String getConfirmation() { - return _selenium.getConfirmation(); + return selenium.getConfirmation(); } public Number getCursorPosition(String locator) { - return _selenium.getCursorPosition(locator); + return selenium.getCursorPosition(locator); } public String getEval(String script) { - return _selenium.getEval(script); + return selenium.getEval(script); } public String getExpression(String expression) { - return _selenium.getExpression(expression); + return selenium.getExpression(expression); } public Number getXpathCount(String xpath) { - return _selenium.getXpathCount(xpath); + return selenium.getXpathCount(xpath); } public void assignId(String locator, String identifier) { - _selenium.assignId(locator, identifier); + selenium.assignId(locator, identifier); } public void allowNativeXpath(String allow) { - _selenium.allowNativeXpath(allow); + selenium.allowNativeXpath(allow); } public String getHtmlSource() { - return _selenium.getHtmlSource(); + return selenium.getHtmlSource(); } public String getLocation() { - return _selenium.getLocation(); + return selenium.getLocation(); } public String getPrompt() { - return _selenium.getPrompt(); + return selenium.getPrompt(); } public String getSelectedId(String selectLocator) { - return _selenium.getSelectedId(selectLocator); + return selenium.getSelectedId(selectLocator); } public String[] getSelectedIds(String selectLocator) { - return _selenium.getSelectedIds(selectLocator); + return selenium.getSelectedIds(selectLocator); } public String getSelectedIndex(String selectLocator) { - return _selenium.getSelectedIndex(selectLocator); + return selenium.getSelectedIndex(selectLocator); } public String[] getSelectedIndexes(String selectLocator) { - return _selenium.getSelectedIndexes(selectLocator); + return selenium.getSelectedIndexes(selectLocator); } public String getSelectedLabel(String selectLocator) { - return _selenium.getSelectedLabel(selectLocator); + return selenium.getSelectedLabel(selectLocator); } public String[] getSelectedLabels(String selectLocator) { - return _selenium.getSelectedLabels(selectLocator); + return selenium.getSelectedLabels(selectLocator); } public String getSelectedValue(String selectLocator) { - return _selenium.getSelectedValue(selectLocator); + return selenium.getSelectedValue(selectLocator); } public String[] getSelectedValues(String selectLocator) { - return _selenium.getSelectedValues(selectLocator); + return selenium.getSelectedValues(selectLocator); } public String[] getSelectOptions(String selectLocator) { - return _selenium.getSelectOptions(selectLocator); + return selenium.getSelectOptions(selectLocator); } public String getTable(String tableCellAddress) { - return _selenium.getTable(tableCellAddress); + return selenium.getTable(tableCellAddress); } public String getText(String locator) { - return _selenium.getText(locator); + return selenium.getText(locator); } public void highlight(String locator) { - _selenium.highlight(locator); + selenium.highlight(locator); } public String getTitle() { - return _selenium.getTitle(); + return selenium.getTitle(); } public String getValue(String locator) { - return _selenium.getValue(locator); + return selenium.getValue(locator); } public void goBack() { - _selenium.goBack(); + selenium.goBack(); } public boolean isAlertPresent() { - return _selenium.isAlertPresent(); + return selenium.isAlertPresent(); } public boolean isChecked(String locator) { - return _selenium.isChecked(locator); + return selenium.isChecked(locator); } public boolean isConfirmationPresent() { - return _selenium.isConfirmationPresent(); + return selenium.isConfirmationPresent(); } public boolean isEditable(String locator) { - return _selenium.isEditable(locator); + return selenium.isEditable(locator); } public boolean isElementPresent(String locator) { - return _selenium.isElementPresent(locator); + return selenium.isElementPresent(locator); } public boolean isPromptPresent() { - return _selenium.isPromptPresent(); + return selenium.isPromptPresent(); } public boolean isSomethingSelected(String selectLocator) { - return _selenium.isSomethingSelected(selectLocator); + return selenium.isSomethingSelected(selectLocator); } public boolean isTextPresent(String pattern) { - return _selenium.isTextPresent(pattern); + return selenium.isTextPresent(pattern); } public boolean isVisible(String locator) { - return _selenium.isVisible(locator); + return selenium.isVisible(locator); } public void keyDown(String locator, String keycode) { - _selenium.keyDown(locator, keycode); + selenium.keyDown(locator, keycode); } public void keyPress(String locator, String keycode) { - _selenium.keyPress(locator, keycode); + selenium.keyPress(locator, keycode); } public void shiftKeyDown() { - _selenium.shiftKeyDown(); + selenium.shiftKeyDown(); } public void shiftKeyUp() { - _selenium.shiftKeyUp(); + selenium.shiftKeyUp(); } public void metaKeyDown() { - _selenium.metaKeyDown(); + selenium.metaKeyDown(); } public void metaKeyUp() { - _selenium.metaKeyUp(); + selenium.metaKeyUp(); } public void altKeyDown() { - _selenium.altKeyDown(); + selenium.altKeyDown(); } public void altKeyUp() { - _selenium.altKeyUp(); + selenium.altKeyUp(); } public void controlKeyDown() { - _selenium.controlKeyDown(); + selenium.controlKeyDown(); } public void controlKeyUp() { - _selenium.controlKeyUp(); + selenium.controlKeyUp(); } public void keyUp(String locator, String keycode) { - _selenium.keyUp(locator, keycode); + selenium.keyUp(locator, keycode); } public void mouseDown(String locator) { - _selenium.mouseDown(locator); + selenium.mouseDown(locator); } public void mouseDownAt(String locator, String coordString) { - _selenium.mouseDownAt(locator, coordString); + selenium.mouseDownAt(locator, coordString); } public void mouseUp(String locator) { - _selenium.mouseUp(locator); + selenium.mouseUp(locator); } public void mouseUpAt(String locator, String coordString) { - _selenium.mouseUpAt(locator, coordString); + selenium.mouseUpAt(locator, coordString); } public void mouseMove(String locator) { - _selenium.mouseMove(locator); + selenium.mouseMove(locator); } public void mouseMoveAt(String locator, String coordString) { - _selenium.mouseMoveAt(locator, coordString); + selenium.mouseMoveAt(locator, coordString); } public void mouseOver(String locator) { - _selenium.mouseOver(locator); + selenium.mouseOver(locator); } public void mouseOut(String locator) { - _selenium.mouseOut(locator); + selenium.mouseOut(locator); } public void open(String url) { - _selenium.open(url); + selenium.open(url); waitForPageToLoad(PAGE_LOAD_TIMEOUT); } public void openWindow(String url, String windowID) { - _selenium.openWindow(url, windowID); + selenium.openWindow(url, windowID); } public void refresh() { - _selenium.refresh(); + selenium.refresh(); } public void removeSelection(String locator, String optionLocator) { - _selenium.removeSelection(locator, optionLocator); + selenium.removeSelection(locator, optionLocator); } public void removeAllSelections(String locator) { - _selenium.removeAllSelections(locator); + selenium.removeAllSelections(locator); } public void select(String selectLocator, String optionLocator) { - _selenium.select(selectLocator, optionLocator); + selenium.select(selectLocator, optionLocator); } public void selectWindow(String windowID) { - _selenium.selectWindow(windowID); + selenium.selectWindow(windowID); } public void selectFrame(String locator) { - _selenium.selectFrame(locator); + selenium.selectFrame(locator); } public boolean getWhetherThisFrameMatchFrameExpression(String currentFrameString, String target) { - return _selenium.getWhetherThisFrameMatchFrameExpression(currentFrameString, target); + return selenium.getWhetherThisFrameMatchFrameExpression(currentFrameString, target); } public boolean getWhetherThisWindowMatchWindowExpression(String currentWindowString, String target) { - return _selenium.getWhetherThisWindowMatchWindowExpression(currentWindowString, target); + return selenium.getWhetherThisWindowMatchWindowExpression(currentWindowString, target); } public void setCursorPosition(String locator, String position) { - _selenium.setCursorPosition(locator, position); + selenium.setCursorPosition(locator, position); } public Number getElementIndex(String locator) { - return _selenium.getElementIndex(locator); + return selenium.getElementIndex(locator); } public boolean isOrdered(String locator1, String locator2) { - return _selenium.isOrdered(locator1, locator2); + return selenium.isOrdered(locator1, locator2); } public Number getElementPositionLeft(String locator) { - return _selenium.getElementPositionLeft(locator); + return selenium.getElementPositionLeft(locator); } public Number getElementPositionTop(String locator) { - return _selenium.getElementPositionTop(locator); + return selenium.getElementPositionTop(locator); } public Number getElementWidth(String locator) { - return _selenium.getElementWidth(locator); + return selenium.getElementWidth(locator); } public Number getElementHeight(String locator) { - return _selenium.getElementHeight(locator); + return selenium.getElementHeight(locator); } public void setTimeout(String timeout) { - _selenium.setTimeout(timeout); + selenium.setTimeout(timeout); } public void start() { - _selenium.start(); + selenium.start(); } public void stop() { - _selenium.stop(); + selenium.stop(); } public void submit(String formLocator) { - _selenium.submit(formLocator); + selenium.submit(formLocator); } public void type(String locator, String value) { - _selenium.type(locator, value); + selenium.type(locator, value); } public void typeKeys(String locator, String value) { - _selenium.typeKeys(locator, value); + selenium.typeKeys(locator, value); } public void setSpeed(String value) { - _selenium.setSpeed(value); + selenium.setSpeed(value); } public void getSpeed() { - _selenium.getSpeed(); + selenium.getSpeed(); } public void uncheck(String locator) { - _selenium.uncheck(locator); + selenium.uncheck(locator); } public void waitForCondition(String script, String timeout) { - _selenium.waitForCondition(script, timeout); + selenium.waitForCondition(script, timeout); } public void waitForPageToLoad(String timeout) { - _selenium.waitForPageToLoad(timeout); + selenium.waitForPageToLoad(timeout); } public void waitForFrameToLoad(String frameAddress, String timeout) { - _selenium.waitForFrameToLoad(frameAddress, timeout); + selenium.waitForFrameToLoad(frameAddress, timeout); } public String getCookie() { - return _selenium.getCookie(); + return selenium.getCookie(); } public void createCookie(String nameValuePair, String optionsString) { - _selenium.createCookie(nameValuePair, optionsString); + selenium.createCookie(nameValuePair, optionsString); } public void deleteCookie(String name, String path) { - _selenium.deleteCookie(name, path); + selenium.deleteCookie(name, path); } public void setBrowserLogLevel(String logLevel) { - _selenium.setBrowserLogLevel(logLevel); + selenium.setBrowserLogLevel(logLevel); } public void runScript(String script) { - _selenium.runScript(script); + selenium.runScript(script); } public void addLocationStrategy(String strategyName, String functionDefinition) { - _selenium.addLocationStrategy(strategyName, functionDefinition); + selenium.addLocationStrategy(strategyName, functionDefinition); } public void setContext(String context) { - _selenium.setContext(context); + selenium.setContext(context); } public void captureScreenshot(String filename) { - _selenium.captureScreenshot(filename); + selenium.captureScreenshot(filename); } @@ -865,7 +865,7 @@ public void waitForPopUp(String windowID, String timeout) { - _selenium.waitForPopUp(windowID, timeout); + selenium.waitForPopUp(windowID, timeout); } /**
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java (original) +++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java Tue May 6 11:51:27 2008 @@ -17,16 +17,15 @@ import com.thoughtworks.selenium.CommandProcessor; /** - * A wrapper around a standard command processor that adds additional exception reporting when a - * failure occurs. + * A wrapper around a standard command processor that adds additional exception reporting when a failure occurs. */ public class ErrorReportingCommandProcessor implements CommandProcessor { - private final CommandProcessor _delegate; + private final CommandProcessor delegate; public ErrorReportingCommandProcessor(final CommandProcessor delegate) { - _delegate = delegate; + this.delegate = delegate; } private static final String BORDER = "**********************************************************************"; @@ -53,7 +52,7 @@ builder.append("\n\nPage source:\n\n"); - builder.append(_delegate.getString("getHtmlSource", new String[]{})); + builder.append(delegate.getString("getHtmlSource", new String[] { })); builder.append("\n"); builder.append(BORDER); @@ -65,7 +64,7 @@ { try { - return _delegate.doCommand(command, args); + return delegate.doCommand(command, args); } catch (RuntimeException ex) { @@ -78,7 +77,7 @@ { try { - return _delegate.getBoolean(string, strings); + return delegate.getBoolean(string, strings); } catch (RuntimeException ex) { @@ -91,7 +90,7 @@ { try { - return _delegate.getBooleanArray(string, strings); + return delegate.getBooleanArray(string, strings); } catch (RuntimeException ex) { @@ -104,7 +103,7 @@ { try { - return _delegate.getNumber(string, strings); + return delegate.getNumber(string, strings); } catch (RuntimeException ex) { @@ -117,7 +116,7 @@ { try { - return _delegate.getNumberArray(string, strings); + return delegate.getNumberArray(string, strings); } catch (RuntimeException ex) { @@ -130,7 +129,7 @@ { try { - return _delegate.getString(string, strings); + return delegate.getString(string, strings); } catch (RuntimeException ex) { @@ -143,7 +142,7 @@ { try { - return _delegate.getStringArray(string, strings); + return delegate.getStringArray(string, strings); } catch (RuntimeException ex) { @@ -154,12 +153,12 @@ public void start() { - _delegate.start(); + delegate.start(); } public void stop() { - _delegate.stop(); + delegate.stop(); } } Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java (original) +++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java Tue May 6 11:51:27 2008 @@ -37,15 +37,15 @@ public static final int DEFAULT_SECURE_PORT = 8443; - private final File _workingDir; + private final File workingDir; - private final String _contextPath; + private final String contextPath; - private final int _port; + private final int port; - private final String _warPath; + private final String warPath; - private final Server _jetty; + private final Server jetty; /** * Creates and starts a new instance of Jetty. This should be done from a test case setup method. @@ -57,12 +57,12 @@ */ public JettyRunner(File workingDir, String contextPath, int port, String warPath) { - _workingDir = workingDir; - _contextPath = contextPath; - _port = port; - _warPath = warPath; + this.workingDir = workingDir; + this.contextPath = contextPath; + this.port = port; + this.warPath = warPath; - _jetty = createAndStart(); + jetty = createAndStart(); } /** @@ -70,14 +70,14 @@ */ public void stop() { - System.out.printf("Stopping Jetty instance on port %d\n", _port); + System.out.printf("Stopping Jetty instance on port %d\n", port); try { // Stop immediately and not gracefully. - _jetty.stop(false); + jetty.stop(false); - while (_jetty.isStarted()) + while (jetty.isStarted()) { Thread.sleep(100); } @@ -93,7 +93,7 @@ @Override public String toString() { - return format("<JettyRunner %s:%d (%s)>", _contextPath, _port, _warPath); + return format("<JettyRunner %s:%d (%s)>", contextPath, port, warPath); } @@ -102,19 +102,19 @@ try { - String warPath = new File(_workingDir, _warPath).getPath(); - String webDefaults = new File(_workingDir, "src/test/conf/webdefault.xml").getPath(); + String warPath = new File(workingDir, this.warPath).getPath(); + String webDefaults = new File(workingDir, "src/test/conf/webdefault.xml").getPath(); - File keystoreFile = new File(_workingDir, "src/test/conf/keystore"); + File keystoreFile = new File(workingDir, "src/test/conf/keystore"); String keystore = keystoreFile.getPath(); - System.out.printf("Starting Jetty instance on port %d (%s mapped to %s)\n", _port, _contextPath, warPath); + System.out.printf("Starting Jetty instance on port %d (%s mapped to %s)\n", port, contextPath, warPath); Server server = new Server(); SocketListener socketListener = new SocketListener(); - socketListener.setPort(_port); + socketListener.setPort(port); server.addListener(socketListener); if (keystoreFile.exists()) @@ -131,7 +131,7 @@ NCSARequestLog log = new NCSARequestLog(); server.setRequestLog(log); - WebApplicationContext context = server.addWebApplication(_contextPath, warPath); + WebApplicationContext context = server.addWebApplication(contextPath, warPath); context.setDefaultsDescriptor(webDefaults); Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java (original) +++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java Tue May 6 11:51:27 2008 @@ -21,15 +21,15 @@ import java.util.Random; /** - * Provides access to random data that can be used when populating a test database with "reasonable" - * data. The majority of this is access to random words from an american english dictionary, which - * can be strung together to form names, sentences and paragraphs. + * Provides access to random data that can be used when populating a test database with "reasonable" data. The majority + * of this is access to random words from an american english dictionary, which can be strung together to form names, + * sentences and paragraphs. */ public final class RandomDataSource { - private final Random _random = new Random(System.currentTimeMillis()); + private final Random random = new Random(System.currentTimeMillis()); - private final List<String> _words = new ArrayList<String>(); + private final List<String> words = new ArrayList<String>(); public RandomDataSource() { @@ -39,7 +39,7 @@ for (int i = 0; i < 3; i++) readWords("american." + i); - System.out.printf("Dictionary contains %d words\n", _words.size()); + System.out.printf("Dictionary contains %d words\n", words.size()); } private void readWords(String name) @@ -65,7 +65,7 @@ if (word == null) break; count++; - _words.add(word); + words.add(word); } r.close(); @@ -82,14 +82,14 @@ { assert percent > 0 && percent <= 100; - return _random.nextInt(100) < percent; + return random.nextInt(100) < percent; } public int random(int min, int max) { assert min <= max; - return _random.nextInt(max - min + 1) + min; + return random.nextInt(max - min + 1) + min; } /** @@ -97,9 +97,9 @@ */ public String word() { - int index = _random.nextInt(_words.size()); + int index = random.nextInt(words.size()); - return _words.get(index); + return words.get(index); } /** @@ -135,7 +135,7 @@ { assert values.length > 0; - int index = _random.nextInt(values.length); + int index = random.nextInt(values.length); return values[index]; } @@ -149,8 +149,8 @@ } /** - * Creates a space-separated list of random words. If in sentence form, then the first word is - * capitalized, and a period is appended. + * Creates a space-separated list of random words. If in sentence form, then the first word is capitalized, and a + * period is appended. * * @param minWords minimun number of words in the list * @param maxWords maximum number of words in the list @@ -183,8 +183,8 @@ } /** - * Strings together a random number of word lists (in sentence form) to create something that - * looks like a paragraph. + * Strings together a random number of word lists (in sentence form) to create something that looks like a + * paragraph. * * @param minSentences per paragraph * @param maxSentences per paragraph Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java Tue May 6 11:51:27 2008 @@ -31,6 +31,7 @@ /** * A component to upload a file. */ [EMAIL PROTECTED]({ "UnusedDeclaration" }) public class Upload extends AbstractField { public static final String MULTIPART_ENCTYPE = "multipart/form-data"; @@ -40,7 +41,7 @@ * the content may have been cleaned up. */ @Parameter(required = true, principal = true) - private UploadedFile _value; + private UploadedFile value; /** * The object that will perform input validation. The "validate:" binding prefix is generally used to provide this @@ -48,45 +49,45 @@ */ @Parameter(defaultPrefix = "validate") @SuppressWarnings("unchecked") - private FieldValidator<Object> _validate = NOOP_VALIDATOR; + private FieldValidator<Object> validate = NOOP_VALIDATOR; @Environmental - private ValidationTracker _tracker; + private ValidationTracker tracker; @Inject - private MultipartDecoder _decoder; + private MultipartDecoder decoder; @Environmental - private FormSupport _formSupport; + private FormSupport formSupport; @Inject - private FieldValidatorDefaultSource _fieldValidatorDefaultSource; + private FieldValidatorDefaultSource fieldValidatorDefaultSource; @Inject - private ComponentResources _resources; + private ComponentResources resources; @Inject - private Locale _locale; + private Locale locale; @Inject - private FieldValidationSupport _fieldValidationSupport; + private FieldValidationSupport fieldValidationSupport; @SuppressWarnings("unused") @Mixin - private RenderDisabled _renderDisabled; + private RenderDisabled renderDisabled; /** * Computes a default value for the "validate" parameter using [EMAIL PROTECTED] FieldValidatorDefaultSource}. */ final FieldValidator defaultValidate() { - Class type = _resources.getBoundType("value"); + Class type = resources.getBoundType("value"); if (type == null) return null; - return _fieldValidatorDefaultSource.createDefaultValidator(this, _resources.getId(), - _resources.getContainerMessages(), _locale, type, - _resources.getAnnotationProvider("value")); + return fieldValidatorDefaultSource.createDefaultValidator(this, resources.getId(), + resources.getContainerMessages(), locale, type, + resources.getAnnotationProvider("value")); } public Upload() @@ -97,19 +98,19 @@ Upload(UploadedFile value, FieldValidator<Object> validate, MultipartDecoder decoder, ValidationTracker tracker, ComponentResources resources, FieldValidationSupport fieldValidationSupport) { - _value = value; - if (validate != null) _validate = validate; - _decoder = decoder; - _tracker = tracker; - _resources = resources; - _fieldValidationSupport = fieldValidationSupport; + this.value = value; + if (validate != null) this.validate = validate; + this.decoder = decoder; + this.tracker = tracker; + this.resources = resources; + this.fieldValidationSupport = fieldValidationSupport; } - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) @Override protected void processSubmission(String elementName) { - UploadedFile uploaded = _decoder.getFileUpload(elementName); + UploadedFile uploaded = decoder.getFileUpload(elementName); if (uploaded != null) { @@ -118,14 +119,14 @@ try { - _fieldValidationSupport.validate(uploaded, _resources, _validate); + fieldValidationSupport.validate(uploaded, resources, validate); } catch (ValidationException ex) { - _tracker.recordError(this, ex.getMessage()); + tracker.recordError(this, ex.getMessage()); } - _value = uploaded; + value = uploaded; } /** @@ -135,13 +136,13 @@ */ protected void beginRender(MarkupWriter writer) { - _formSupport.setEncodingType(MULTIPART_ENCTYPE); + formSupport.setEncodingType(MULTIPART_ENCTYPE); writer.element("input", "type", "file", "name", getControlName(), "id", getClientId()); - _validate.render(writer); + validate.render(writer); - _resources.renderInformalParameters(writer); + resources.renderInformalParameters(writer); decorateInsideField(); } @@ -153,7 +154,7 @@ public UploadedFile getValue() { - return _value; + return value; } Binding defaultValue() @@ -169,7 +170,7 @@ void injectFormSupport(FormSupport formSupport) { // We have our copy ... - _formSupport = formSupport; + this.formSupport = formSupport; // As does AbstractField setFormSupport(formSupport); Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java Tue May 6 11:51:27 2008 @@ -40,13 +40,13 @@ { private final Map<String, UploadedFileItem> _uploads = newMap(); - private final String _repositoryLocation; + private final String repositoryLocation; - private final int _repositoryThreshold; + private final int repositoryThreshold; - private final long _maxRequestSize; + private final long maxRequestSize; - private final long _maxFileSize; + private final long maxFileSize; public MultipartDecoderImpl( @@ -62,10 +62,10 @@ @Symbol(UploadSymbols.FILESIZE_MAX) long maxFileSize) { - _repositoryLocation = repositoryLocation; - _repositoryThreshold = repositoryThreshold; - _maxRequestSize = maxRequestSize; - _maxFileSize = maxFileSize; + this.repositoryLocation = repositoryLocation; + this.repositoryThreshold = repositoryThreshold; + this.maxRequestSize = maxRequestSize; + this.maxFileSize = maxFileSize; } public UploadedFile getFileUpload(String parameterName) @@ -103,12 +103,12 @@ protected ServletFileUpload createFileUpload() { - FileItemFactory factory = new DiskFileItemFactory(_repositoryThreshold, new File(_repositoryLocation)); + FileItemFactory factory = new DiskFileItemFactory(repositoryThreshold, new File(repositoryLocation)); ServletFileUpload upload = new ServletFileUpload(factory); // set maximum file upload size - upload.setSizeMax(_maxRequestSize); - upload.setFileSizeMax(_maxFileSize); + upload.setSizeMax(maxRequestSize); + upload.setFileSizeMax(maxFileSize); return upload; } Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java Tue May 6 11:51:27 2008 @@ -28,17 +28,17 @@ */ public class MultipartServletRequestFilter implements HttpServletRequestFilter { - private final MultipartDecoder _decoder; + private final MultipartDecoder decoder; public MultipartServletRequestFilter(MultipartDecoder multipartDecoder) { - _decoder = multipartDecoder; + decoder = multipartDecoder; } public boolean service(HttpServletRequest request, HttpServletResponse response, HttpServletRequestHandler handler) throws IOException { - HttpServletRequest newRequest = ServletFileUpload.isMultipartContent(request) ? _decoder.decode( + HttpServletRequest newRequest = ServletFileUpload.isMultipartContent(request) ? decoder.decode( request) : request; return handler.service(newRequest, response); Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java Tue May 6 11:51:27 2008 @@ -23,7 +23,7 @@ */ public class ParameterValue { - private final List<String> _values = newList(); + private final List<String> values = newList(); public static final ParameterValue NULL = new ParameterValue() { @@ -42,7 +42,7 @@ public ParameterValue(String value) { - _values.add(value); + values.add(value); } public ParameterValue(String... values) @@ -58,7 +58,7 @@ */ public String single() { - return _values.get(0); + return values.get(0); } /** @@ -66,16 +66,16 @@ */ public String[] multi() { - return _values.toArray(new String[_values.size()]); + return values.toArray(new String[values.size()]); } public void add(String value) { - _values.add(value); + values.add(value); } public boolean isMulti() { - return _values.size() > 1; + return values.size() > 1; } } Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java Tue May 6 11:51:27 2008 @@ -30,7 +30,7 @@ */ public class ParametersServletRequestWrapper extends HttpServletRequestWrapper { - private final Map<String, ParameterValue> _parameters = newMap(); + private final Map<String, ParameterValue> parameters = newMap(); public ParametersServletRequestWrapper(HttpServletRequest httpServletRequest) { @@ -48,7 +48,7 @@ { Map<String, Object> paramMap = newMap(); - for (Map.Entry<String, ParameterValue> e : _parameters.entrySet()) + for (Map.Entry<String, ParameterValue> e : parameters.entrySet()) { ParameterValue value = e.getValue(); @@ -61,7 +61,7 @@ @Override public Enumeration getParameterNames() { - return Collections.enumeration(_parameters.keySet()); + return Collections.enumeration(parameters.keySet()); } @Override @@ -72,11 +72,11 @@ public void addParameter(String name, String value) { - ParameterValue pv = _parameters.get(name); + ParameterValue pv = parameters.get(name); if (pv == null) { pv = new ParameterValue(value); - _parameters.put(name, pv); + parameters.put(name, pv); } else { @@ -86,7 +86,7 @@ ParameterValue getValueFor(String name) { - ParameterValue value = _parameters.get(name); + ParameterValue value = parameters.get(name); return value == null ? ParameterValue.NULL : value; } Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java Tue May 6 11:51:27 2008 @@ -27,16 +27,16 @@ */ public class UploadedFileItem implements UploadedFile { - private final FileItem _item; + private final FileItem item; public UploadedFileItem(FileItem item) { - _item = item; + this.item = item; } public String getContentType() { - return _item.getContentType(); + return item.getContentType(); } public String getFileName() @@ -46,19 +46,19 @@ public String getFilePath() { - return _item.getName(); + return item.getName(); } public long getSize() { - return _item.getSize(); + return item.getSize(); } public InputStream getStream() { try { - return _item.getInputStream(); + return item.getInputStream(); } catch (IOException e) { @@ -68,14 +68,14 @@ public boolean isInMemory() { - return _item.isInMemory(); + return item.isInMemory(); } public void write(File file) { try { - _item.write(file); + item.write(file); } catch (Exception e) { @@ -85,6 +85,6 @@ public void cleanup() { - _item.delete(); + item.delete(); } } Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java Tue May 6 11:51:27 2008 @@ -30,7 +30,8 @@ public class UploadModule { - private static final AtomicBoolean _needToAddShutdownListener = new AtomicBoolean(true); + private static final AtomicBoolean needToAddShutdownListener = new AtomicBoolean(true); + private static final String NO_LIMIT = "-1"; public static void contributeComponentClassResolver(Configuration<LibraryMapping> configuration) { @@ -52,7 +53,7 @@ // be safe. perthreadManager.addThreadCleanupListener(multipartDecoder); - if (_needToAddShutdownListener.getAndSet(false)) + if (needToAddShutdownListener.getAndSet(false)) { shutdownHub.addRegistryShutdownListener(new RegistryShutdownListener() { @@ -80,9 +81,7 @@ configuration.add(UploadSymbols.REPOSITORY_THRESHOLD, Integer .toString(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD)); configuration.add(UploadSymbols.REPOSITORY_LOCATION, System.getProperty("java.io.tmpdir")); - // No limit - configuration.add(UploadSymbols.REQUESTSIZE_MAX, "-1"); - // No limit - configuration.add(UploadSymbols.FILESIZE_MAX, "-1"); + configuration.add(UploadSymbols.REQUESTSIZE_MAX, NO_LIMIT); + configuration.add(UploadSymbols.FILESIZE_MAX, NO_LIMIT); } } Modified: tapestry/tapestry5/trunk/tapestry-upload/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/site/apt/index.apt?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/site/apt/index.apt (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/site/apt/index.apt Tue May 6 11:51:27 2008 @@ -35,23 +35,23 @@ +---+ public class UploadExample { - private UploadedFile _file; + private UploadedFile file; public UploadedFile getFile() { - return _file; + return file; } public void setFile(UploadedFile file) { - _file = file; + this.file = file; } public void onSuccess() { - File copied = new File("/my/file/location/" + _file.getFileName()); + File copied = new File("/my/file/location/" + file.getFileName()); - _file.write(copied); + file.write(copied); } } +---+ @@ -67,7 +67,7 @@ to terminate this thread prematurely and cause errors for the other applications. (see the {{{http://jakarta.apache.org/commons/fileupload/using.html}Resource Cleanup}} section in for more discussion) - Technically the file cleanup service is not need by Tapestry Upload (which deletes temporary files at the end - of request processing). However it is currently not possible to disable it (enhancment request has been filed + Technically the file cleanup service is not needed by Tapestry Upload (which deletes temporary files at the end + of request processing). However it is currently not possible to disable it (enhancement request has been filed as {{{https://issues.apache.org/jira/browse/FILEUPLOAD-133}FILEUPLOAD-133}}). Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java?rev=653881&r1=653880&r2=653881&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java (original) +++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java Tue May 6 11:51:27 2008 @@ -1,17 +1,17 @@ -// Copyright 2007 The Apache Software Foundation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +// Copyright 2007 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package org.example.upload.pages; import org.apache.tapestry.annotations.Persist; @@ -24,22 +24,22 @@ public static final String TARGET_DIR = "target/tmp/"; @Persist - private UploadedFile _file; + private UploadedFile file; public UploadedFile getFile() { - return _file; + return file; } public void setFile(UploadedFile file) { - _file = file; + this.file = file; } public void onSuccess() { - File copied = new File(TARGET_DIR + _file.getFileName()); + File copied = new File(TARGET_DIR + file.getFileName()); - _file.write(copied); + file.write(copied); } }
